aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock21
1 files changed, 7 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c0132a45b7..8cf764797c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,16 +36,6 @@ GIT
activesupport (>= 4.1.0)
GIT
- remote: git://github.com/rails/sprockets-rails.git
- revision: 06d84e952490d7d391592124f6e3b79f9c596674
- branch: master
- specs:
- sprockets-rails (3.0.0.beta3)
- actionpack (>= 4.0)
- activesupport (>= 4.0)
- sprockets (>= 3.0.0)
-
-GIT
remote: git://github.com/sass/sass.git
revision: bce9509f396225d721501ea1070a6871b708abb1
branch: stable
@@ -210,11 +200,11 @@ GEM
mysql2 (0.4.2)
mysql2 (0.4.2-x64-mingw32)
mysql2 (0.4.2-x86-mingw32)
- nokogiri (1.6.7)
+ nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
- nokogiri (1.6.7-x64-mingw32)
+ nokogiri (1.6.7.1-x64-mingw32)
mini_portile2 (~> 2.0.0.rc2)
- nokogiri (1.6.7-x86-mingw32)
+ nokogiri (1.6.7.1-x86-mingw32)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
pg (0.18.4-x64-mingw32)
@@ -278,6 +268,10 @@ GEM
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
+ sprockets-rails (3.0.0)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
sqlite3 (1.3.11)
sqlite3 (1.3.11-x64-mingw32)
sqlite3 (1.3.11-x86-mingw32)
@@ -354,7 +348,6 @@ DEPENDENCIES
sequel
sidekiq
sneakers
- sprockets-rails (~> 3.0.0.beta3)!
sqlite3 (~> 1.3.6)
stackprof
sucker_punch