Skip to content

Commit

Permalink
update gems
Browse files Browse the repository at this point in the history
  • Loading branch information
jhass committed Nov 24, 2014
1 parent 4c3f844 commit 3088739
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem 'rails_locale_detection', '~> 2.0.0.pre'
gem 'sass-rails', '~> 4.0.0'
gem 'bootstrap-sass', '~> 3.2.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0'
gem 'jquery-rails'
gem 'turbolinks'

Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GEM
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
builder (3.2.2)
capybara (2.4.1)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
Expand All @@ -42,7 +42,7 @@ GEM
activesupport (>= 3.0)
cocaine (0.5.4)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.0.1)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
Expand Down Expand Up @@ -143,14 +143,14 @@ GEM
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.1)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-instafail (0.2.5)
rspec
rspec-mocks (3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
Expand All @@ -160,8 +160,8 @@ GEM
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.0)
ruby-progressbar (1.5.1)
rspec-support (3.1.2)
ruby-progressbar (1.7.0)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.4)
Expand All @@ -181,7 +181,7 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
turbolinks (2.3.0)
turbolinks (2.5.2)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
Expand All @@ -203,7 +203,7 @@ PLATFORMS
DEPENDENCIES
bootstrap-sass (~> 3.2.0)
capybara (~> 2.4.1)
coffee-rails (~> 4.0.0)
coffee-rails (~> 4.0)
devise (~> 3.4.0)
fuubar (~> 2.0.0)
jquery-rails
Expand Down

0 comments on commit 3088739

Please sign in to comment.