diff --git a/Gemfile b/Gemfile index a05a170..f7f2e1a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,4 @@ -if ENV['RUBYTAOBAO'] - source 'https://ruby.taobao.org' -else - source 'https://rubygems.org' -end +source 'https://rubygems.org' gem 'rails', '4.2.5.2' gem 'sass-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 5bc087d..affa7d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: https://ruby.taobao.org/ + remote: https://rubygems.org/ specs: actionmailer (4.2.5.2) actionpack (= 4.2.5.2) @@ -39,7 +39,7 @@ GEM addressable (2.4.0) angularjs-rails (1.5.0) arel (6.0.3) - bson (4.0.3) + bson (4.0.4) builder (3.2.2) capybara (2.6.2) addressable @@ -73,7 +73,7 @@ GEM database_cleaner (1.5.1) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160216) + domain_name (0.5.20160309) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) execjs (2.6.0) @@ -125,8 +125,8 @@ GEM jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.1.0) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) @@ -221,7 +221,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (10.5.0) + rake (11.1.1) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -240,7 +240,7 @@ GEM rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.3) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -268,7 +268,7 @@ GEM sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) shellany (0.0.1) - sidekiq (4.1.0) + sidekiq (4.1.1) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) @@ -294,7 +294,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.3) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0)