Skip to content

Commit

Permalink
bump gems
Browse files Browse the repository at this point in the history
  • Loading branch information
jhass committed Sep 5, 2014
1 parent 631efb4 commit 9b0650c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem 'redcarpet', '~> 3.1.2'
gem 'paperclip', '~> 4.1'

group :development, :test do
gem 'rspec-rails', '~> 3.0.1'
gem 'rspec-rails', '~> 3.0'
gem 'capybara', '~> 2.4.1'

gem 'fuubar', '~> 2.0.0'
Expand Down
50 changes: 25 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ GEM
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
bcrypt (3.1.7)
bootstrap-sass (3.2.0.1)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
builder (3.2.2)
capybara (2.4.1)
Expand All @@ -48,7 +48,7 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
coffee-script-source (1.8.0)
devise (3.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -58,7 +58,7 @@ GEM
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.2.1)
font-awesome-rails (4.1.0.0)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
fuubar (2.0.0)
rspec (~> 3.0)
Expand All @@ -68,7 +68,7 @@ GEM
hike (1.2.3)
http_accept_language (1.0.2)
i18n (0.6.11)
jquery-rails (3.1.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
Expand All @@ -83,7 +83,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (5.4.0)
minitest (5.4.1)
multi_json (1.10.1)
mysql2 (0.3.16)
nested_form (0.3.2)
Expand Down Expand Up @@ -112,7 +112,7 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5)
sprockets-rails (~> 2.0)
rails_admin (0.6.2)
rails_admin (0.6.3)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0)
Expand All @@ -138,28 +138,28 @@ GEM
rake (10.3.2)
redcarpet (3.1.2)
remotipart (1.2.1)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.4)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.1)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-support (~> 3.1.0)
rspec-instafail (0.2.5)
rspec
rspec-mocks (3.0.4)
rspec-support (~> 3.0.0)
rspec-rails (3.0.2)
rspec-mocks (3.1.0)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
rspec-core (~> 3.1.0)
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)
safe_yaml (1.0.3)
sass (3.2.19)
Expand All @@ -173,7 +173,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3)
sprockets-rails (2.1.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
Expand All @@ -183,7 +183,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.2.2)
turbolinks (2.3.0)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
Expand Down Expand Up @@ -216,7 +216,7 @@ DEPENDENCIES
rails_locale_detection (~> 2.0.0.pre)
redcarpet (~> 3.1.2)
rspec-instafail (~> 0.2.4)
rspec-rails (~> 3.0.1)
rspec-rails (~> 3.0)
sass-rails (~> 4.0.0)
turbolinks
uglifier (>= 1.3.0)
Expand Down

0 comments on commit 9b0650c

Please sign in to comment.