Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump sprockets from 2.11.0 to 2.12.5 #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump sprockets from 2.11.0 to 2.12.5 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile 100755 → 100644
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
gem 'spring'
gem 'pry-rails'
gem 'compass-rails','~> 2.0'
gem 'sprockets', '2.11.0'
gem 'sprockets', '2.12.5'
gem 'omniauth'
gem 'omniauth-google-oauth2'
# Use Unicorn as the app server
Expand All @@ -53,7 +53,7 @@ group :development do
gem 'spring'
gem 'pry-rails'
gem 'compass-rails','~> 2.0'
gem 'sprockets', '2.11.0'
gem 'sprockets', '2.12.5'
gem 'devise'
gem 'kaminari'
gem 'twitter-bootstrap-rails'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock 100755 → 100644
View file
Open in desktop
Expand Up @@ -123,7 +123,7 @@ GEM
mime-types-data (3.2016.0521)
mini_portile2 (2.2.0)
minitest (5.10.3)
multi_json (1.12.1)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.4.9)
Expand Down Expand Up @@ -154,7 +154,7 @@ GEM
slop (~> 3.4)
pry-rails (0.3.6)
pry (>= 0.10.4)
rack (1.6.8)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.6)
Expand Down Expand Up @@ -207,7 +207,7 @@ GEM
slop (3.6.0)
spring (2.0.2)
activesupport (>= 4.2)
sprockets (2.11.0)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand Down Expand Up @@ -260,7 +260,7 @@ DEPENDENCIES
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sprockets (= 2.11.0)
sprockets (= 2.12.5)
turbolinks
twitter-bootstrap-rails
uglifier (>= 1.3.0)
Expand Down