From 8ad118935a872bfe36a444facb2896f415dbbba0 Mon Sep 17 00:00:00 2001 From: yafeilee Date: Sat, 1 Nov 2014 00:49:18 +0800 Subject: [PATCH] upgrade rails and related gems. --- Gemfile | 8 +- Gemfile.lock | 131 +++++++++--------- .../stylesheets/foundation_and_overrides.scss | 1 + 3 files changed, 68 insertions(+), 72 deletions(-) diff --git a/Gemfile b/Gemfile index 758c111..5c087f7 100644 --- a/Gemfile +++ b/Gemfile @@ -4,13 +4,13 @@ else source 'https://rubygems.org' end -gem 'rails', '4.1.1' +gem 'rails', '4.1.7' #gem 'sprockets', '2.12.1' -gem 'sass-rails', '~> 4.0.3' -gem 'coffee-rails', '~> 4.0.1' +gem 'sass-rails', '~> 4.0.4' +gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '>= 1.3.0' gem 'jquery-rails' -gem 'foundation-rails', '~> 5.2.1' +gem 'foundation-rails', '~> 5.4' gem 'foundation-icons-sass-rails' gem 'font-awesome-sass' diff --git a/Gemfile.lock b/Gemfile.lock index 3347f6a..56accdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,37 @@ GEM remote: http://ruby.taobao.org/ specs: - actionmailer (4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - mail (~> 2.5.4) - actionpack (4.1.1) - actionview (= 4.1.1) - activesupport (= 4.1.1) + actionmailer (4.1.7) + actionpack (= 4.1.7) + actionview (= 4.1.7) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.7) + actionview (= 4.1.7) + activesupport (= 4.1.7) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.1) - activesupport (= 4.1.1) + actionview (4.1.7) + activesupport (= 4.1.7) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.1) - activesupport (= 4.1.1) + activemodel (4.1.7) + activesupport (= 4.1.7) builder (~> 3.1) - activerecord (4.1.1) - activemodel (= 4.1.1) - activesupport (= 4.1.1) + activerecord (4.1.7) + activemodel (= 4.1.7) + activesupport (= 4.1.7) arel (~> 5.0.0) - activesupport (4.1.1) + activesupport (4.1.7) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - angularjs-rails (1.2.22) + angularjs-rails (1.3.0) arel (5.0.1.20140414130214) bson (2.3.0) builder (3.2.2) - capybara (2.4.3) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -48,11 +48,11 @@ GEM mongoid-grid_fs (>= 1.3, < 3.0) celluloid (0.16.0) timers (~> 4.0.0) - chunky_png (1.3.1) + chunky_png (1.3.3) codeclimate-test-reporter (0.4.1) simplecov (>= 0.7.1, < 1.0.0) coderay (1.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) @@ -64,25 +64,25 @@ GEM diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) - execjs (2.2.1) - factory_girl (4.4.0) + execjs (2.2.2) + factory_girl (4.5.0) activesupport (>= 3.0.0) - factory_girl_rails (4.4.1) - factory_girl (~> 4.4.0) + factory_girl_rails (4.5.0) + factory_girl (~> 4.5.0) railties (>= 3.0.0) - ffi (1.9.5) + ffi (1.9.6) figaro (1.0.0) thor (~> 0.14) - font-awesome-sass (4.0.2) - sass-rails (>= 3.1.1) + font-awesome-sass (4.2.2) + sass (~> 3.2) formatador (0.2.5) foundation-icons-sass-rails (3.0.0) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foundation-rails (5.2.3.0) + foundation-rails (5.4.5.0) railties (>= 3.1.0) sass (>= 3.2.0) - guard (2.6.1) + guard (2.7.0) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) @@ -111,11 +111,10 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.9) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.6.1) + mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.4.3) mini_magick (3.8.1) subexec (~> 0.2.1) mini_portile (0.6.0) @@ -135,18 +134,17 @@ GEM mongoid (>= 3.0.1) rake rspec (>= 2.14) - moped (2.0.0) + moped (2.0.1) bson (~> 2.2) connection_pool (~> 2.0) optionable (~> 0.2.0) multi_json (1.10.1) - netrc (0.7.7) - newrelic_rpm (3.9.4.245) + netrc (0.8.0) + newrelic_rpm (3.9.6.257) nokogiri (1.6.3.1) mini_portile (= 0.6.0) optionable (0.2.0) origin (2.1.1) - polyglot (0.3.5) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -160,19 +158,19 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.1) - actionmailer (= 4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - activemodel (= 4.1.1) - activerecord (= 4.1.1) - activesupport (= 4.1.1) + rails (4.1.7) + actionmailer (= 4.1.7) + actionpack (= 4.1.7) + actionview (= 4.1.7) + activemodel (= 4.1.7) + activerecord (= 4.1.7) + activesupport (= 4.1.7) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.1) + railties (= 4.1.7) sprockets-rails (~> 2.0) - railties (4.1.1) - actionpack (= 4.1.1) - activesupport (= 4.1.1) + railties (4.1.7) + actionpack (= 4.1.7) + activesupport (= 4.1.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -180,26 +178,26 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.1.2) + redcarpet (3.2.0) redis (3.1.0) redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) rest-client (1.7.2) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rouge (1.7.1) + rouge (1.7.2) rqrcode-with-patches (0.5.4) chunky_png rspec (3.1.0) rspec-core (~> 3.1.0) rspec-expectations (~> 3.1.0) rspec-mocks (~> 3.1.0) - rspec-core (3.1.4) + rspec-core (3.1.7) rspec-support (~> 3.1.0) rspec-expectations (3.1.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.1.0) - rspec-mocks (3.1.2) + rspec-mocks (3.1.3) rspec-support (~> 3.1.0) rspec-rails (3.1.0) actionpack (>= 3.0) @@ -212,12 +210,12 @@ GEM rspec-sidekiq (2.0.0) rspec (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.1.1) + rspec-support (3.1.2) sass (3.2.19) - sass-rails (4.0.3) + sass-rails (4.0.4) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 2.12) sprockets-rails (~> 2.0) sidekiq (3.2.4) celluloid (>= 0.15.2) @@ -233,8 +231,8 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - slim (2.0.3) - temple (~> 0.6.6) + slim (2.1.0) + temple (~> 0.6.9) tilt (>= 1.3.3, < 2.1) slim-rails (2.1.5) actionpack (>= 3.0, < 4.2) @@ -243,25 +241,22 @@ GEM slim (~> 2.0) slop (3.6.0) spring (1.1.3) - sprockets (2.11.0) + sprockets (2.11.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.4) + sprockets-rails (2.2.0) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) subexec (0.2.3) - temple (0.6.8) + temple (0.6.10) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) timers (4.0.1) hitimes - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) tzinfo (1.1.0) thread_safe (~> 0.1) uglifier (2.5.3) @@ -283,13 +278,13 @@ DEPENDENCIES carrierwave-mongoid chunky_png codeclimate-test-reporter - coffee-rails (~> 4.0.1) + coffee-rails (~> 4.1.0) database_cleaner factory_girl_rails figaro font-awesome-sass foundation-icons-sass-rails - foundation-rails (~> 5.2.1) + foundation-rails (~> 5.4) guard guard-bundler guard-rails @@ -305,14 +300,14 @@ DEPENDENCIES pry-nav pry-rails quiet_assets - rails (= 4.1.1) + rails (= 4.1.7) redcarpet rest-client rouge rqrcode-with-patches rspec-rails (>= 2.8.1) rspec-sidekiq - sass-rails (~> 4.0.3) + sass-rails (~> 4.0.4) sidekiq simple_form slim-rails diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss index 5fadd5c..ba41e35 100644 --- a/app/assets/stylesheets/foundation_and_overrides.scss +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -1190,4 +1190,5 @@ $base-font-size: 100%; @import 'foundation'; @import 'foundation-icons'; +@import 'font-awesome-sprockets'; @import 'font-awesome';