From 98d8790104d18b44ba331266fd5932c17a45ac4c Mon Sep 17 00:00:00 2001 From: Bryan Bibat Date: Fri, 14 Nov 2014 01:30:11 +0800 Subject: [PATCH] Update Gems --- Gemfile | 4 +- Gemfile.lock | 102 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Gemfile b/Gemfile index 5396451..8d90f63 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.1.6' +gem 'rails', '4.1.7' gem 'pg' gem 'puma', '2.9.1' @@ -14,7 +14,7 @@ gem 'asset_sync' gem 'rails_admin' gem 'haml' -gem 'bootstrap-sass', "~> 3.2.0.0" +gem 'bootstrap-sass', "~> 3.3.1.0" gem 'underscore-rails' gem 'jquery-rails', '>=2.1.1' gem 'devise', '>=2.1.2' diff --git a/Gemfile.lock b/Gemfile.lock index ba30f58..46d705d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.6) - actionpack (= 4.1.6) - actionview (= 4.1.6) + actionmailer (4.1.7) + actionpack (= 4.1.7) + actionview (= 4.1.7) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.6) - actionview (= 4.1.6) - activesupport (= 4.1.6) + actionpack (4.1.7) + actionview (= 4.1.7) + activesupport (= 4.1.7) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.6) - activesupport (= 4.1.6) + actionview (4.1.7) + activesupport (= 4.1.7) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.6) - activesupport (= 4.1.6) + activemodel (4.1.7) + activesupport (= 4.1.7) builder (~> 3.1) - activerecord (4.1.6) - activemodel (= 4.1.6) - activesupport (= 4.1.6) + activerecord (4.1.7) + activemodel (= 4.1.7) + activesupport (= 4.1.7) arel (~> 5.0.0) - activesupport (4.1.6) + activesupport (4.1.7) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -33,14 +33,14 @@ GEM activemodel fog (>= 1.8.0) unf - bcrypt (3.1.7) + bcrypt (3.1.9) better_errors (2.0.0) coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.2.0.2) + bootstrap-sass (3.3.1.0) sass (~> 3.2) builder (3.2.2) callsite (0.0.11) @@ -65,7 +65,7 @@ GEM coffee-script-source (1.8.0) database_cleaner (1.3.0) debug_inspector (0.0.2) - devise (3.4.0) + devise (3.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -78,7 +78,7 @@ GEM launchy (~> 2.1) mail (~> 2.2) erubis (2.7.0) - excon (0.40.0) + excon (0.41.0) execjs (2.2.2) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -95,7 +95,7 @@ GEM fog-softlayer ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) - fog-brightbox (0.5.1) + fog-brightbox (0.6.1) fog-core (~> 1.22) fog-json inflecto @@ -115,10 +115,10 @@ GEM fog-sakuracloud (0.1.1) fog-core fog-json - fog-softlayer (0.3.21) + fog-softlayer (0.3.24) fog-core fog-json - fog-xml (0.1.0) + fog-xml (0.1.1) fog-core nokogiri (~> 1.5, >= 1.5.11) font-awesome-rails (4.2.0.0) @@ -128,7 +128,7 @@ GEM activerecord (>= 4.0.0) gmaps4rails (2.1.2) growl (1.0.3) - guard (2.6.1) + guard (2.8.2) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) @@ -137,8 +137,8 @@ GEM guard-bundler (2.0.0) bundler (~> 1.0) guard (~> 2.2) - guard-puma (0.2.5) - guard (>= 1.0.1) + guard-puma (0.3.1) + guard (~> 2.8) puma guard-rspec (4.3.1) guard (~> 2.1) @@ -169,16 +169,16 @@ GEM kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - launchy (2.4.2) + launchy (2.4.3) addressable (~> 2.3) libnotify (0.8.4) ffi (>= 1.0.11) - listen (2.7.11) + listen (2.7.12) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.9) - mail (2.6.1) + mail (2.6.3) mime-types (>= 1.16, < 3) meta-tags (2.0.0) actionpack (>= 3.0.0) @@ -187,19 +187,19 @@ GEM rack-contrib (~> 1.1) railties (>= 3.0.0, < 5.0.0) method_source (0.8.2) - mime-types (2.4.2) + mime-types (2.4.3) mina (0.3.1) open4 (~> 1.3.4) rake - mini_portile (0.6.0) - minitest (5.4.2) + mini_portile (0.6.1) + minitest (5.4.3) multi_json (1.10.1) nested_form (0.3.2) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) + nokogiri (1.6.4.1) + mini_portile (~> 0.6.0) open4 (1.3.4) orm_adapter (0.5.0) pg (0.17.1) @@ -212,22 +212,22 @@ GEM quiet_assets (1.0.3) railties (>= 3.1, < 5.0) rack (1.5.2) - rack-contrib (1.1.0) + rack-contrib (1.2.0) rack (>= 0.9.1) rack-pjax (0.8.0) nokogiri (~> 1.5) rack (~> 1.1) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.6) - actionmailer (= 4.1.6) - actionpack (= 4.1.6) - actionview (= 4.1.6) - activemodel (= 4.1.6) - activerecord (= 4.1.6) - activesupport (= 4.1.6) + 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.6) + railties (= 4.1.7) sprockets-rails (~> 2.0) rails_admin (0.6.5) builder (~> 3.1) @@ -243,9 +243,9 @@ GEM remotipart (~> 1.0) safe_yaml (~> 1.0) sass-rails (~> 4.0) - railties (4.1.6) - actionpack (= 4.1.6) - activesupport (= 4.1.6) + railties (4.1.7) + actionpack (= 4.1.7) + activesupport (= 4.1.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -254,7 +254,7 @@ GEM ffi (>= 0.5.0) redcarpet (3.2.0) remotipart (1.2.1) - responders (1.1.1) + responders (1.1.2) railties (>= 3.2, < 4.2) rspec (3.1.0) rspec-core (~> 3.1.0) @@ -278,10 +278,10 @@ GEM rspec-support (3.1.2) safe_yaml (1.0.4) 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) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) @@ -302,7 +302,7 @@ GEM slop (3.6.0) spork (0.9.2) spring (1.1.3) - sprockets (2.11.0) + sprockets (2.11.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -339,7 +339,7 @@ DEPENDENCIES asset_sync better_errors binding_of_caller - bootstrap-sass (~> 3.2.0.0) + bootstrap-sass (~> 3.3.1.0) cancan (>= 1.6.8) capybara (~> 2.4.1) coffee-rails (~> 4.1.0) @@ -369,7 +369,7 @@ DEPENDENCIES pry puma (= 2.9.1) quiet_assets - rails (= 4.1.6) + rails (= 4.1.7) rails_admin rb-fsevent rb-inotify