Skip to content

Commit

Permalink
Remove Personalavin from masthead. malmostad/global_assets/issues/10
Browse files Browse the repository at this point in the history
  • Loading branch information
martent committed Nov 10, 2016
1 parent 55bf4a5 commit 18d8653
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 43 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.1'
gem 'rails', '4.2.1'
gem 'thin'
gem 'jquery-rails'
gem 'rack-contrib'

gem 'sass-rails', '~> 4.0.5'
gem 'sass-rails', '4.0.5'
gem 'uglifier'
gem 'coffee-rails'
# gem 'therubyracer', require: 'v8'

gem 'capistrano', '~> 2.15.5'
gem 'capistrano', '2.15.5'
gem 'capistrano-ext'

gem 'net-ssh', '2.7.0' # No prompt for pw in 2.8.0
82 changes: 44 additions & 38 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
arel (6.0.3)
builder (3.2.2)
capistrano (2.15.5)
highline
Expand All @@ -46,47 +46,51 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
coffee-rails (4.1.0)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0, < 5.2.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
daemons (1.2.2)
coffee-script-source (1.10.0)
daemons (1.2.4)
erubis (2.7.0)
eventmachine (1.0.7)
execjs (2.5.2)
globalid (0.3.5)
eventmachine (1.2.0.1)
execjs (2.7.0)
git-version-bump (0.15.1)
globalid (0.3.7)
activesupport (>= 4.1.0)
highline (1.7.1)
highline (1.7.8)
hike (1.2.3)
i18n (0.7.0)
jquery-rails (4.0.3)
rails-dom-testing (~> 1.0)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
loofah (2.0.1)
json (1.8.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.6.0)
multi_json (1.11.0)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
multi_json (1.12.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
rack (1.6.0)
rack-contrib (1.2.0)
rack (>= 0.9.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
rack (1.6.4)
rack-contrib (1.4.0)
git-version-bump (~> 0.15)
rack (~> 1.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.1)
Expand All @@ -102,57 +106,59 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (11.3.0)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sprockets (2.12.3)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thin (1.6.3)
thin (1.7.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
rack (~> 1.0)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)

PLATFORMS
ruby

DEPENDENCIES
capistrano (~> 2.15.5)
capistrano (= 2.15.5)
capistrano-ext
coffee-rails
jquery-rails
net-ssh (= 2.7.0)
rack-contrib
rails (~> 4.2.1)
sass-rails (~> 4.0.5)
rails (= 4.2.1)
sass-rails (= 4.0.5)
thin
uglifier

BUNDLED WITH
1.10.6
4 changes: 2 additions & 2 deletions app/assets/javascripts/masthead_content.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 18d8653

Please sign in to comment.