Permalink
Browse files

Use latest Ruby 2.2.3, Simple Form 3.1.0, Rails 4.1.13, and other bumps

  • Loading branch information...
1 parent b27c0d2 commit 372f71a920d394e29d0e5cf7e2a9d6743ca08af7 @carlosantoniodasilva carlosantoniodasilva committed Aug 27, 2015
Showing with 59 additions and 58 deletions.
  1. +2 −2 Gemfile
  2. +57 −56 Gemfile.lock
View
@@ -1,5 +1,5 @@
source 'http://rubygems.org'
-ruby '2.1.5'
+ruby '2.2.3'
gem 'rails', '~> 4.1.0'
@@ -11,7 +11,7 @@ gem 'jquery-rails'
gem 'sass-rails', '~> 4.0.2'
gem 'bootstrap-sass', '~> 3.3.0'
-gem 'simple_form', '~> 3.1.0.rc1', github: 'plataformatec/simple_form', branch: 'master'
+gem 'simple_form', '~> 3.1.0'
group :production do
gem 'pg'
View
@@ -1,92 +1,90 @@
-GIT
- remote: git://github.com/plataformatec/simple_form.git
- revision: 812f1209bc1d0c264f7e15ad2bdaf98eb1883469
- branch: master
- specs:
- simple_form (3.1.0.rc2)
- actionpack (~> 4.0)
- activemodel (~> 4.0)
-
GEM
remote: http://rubygems.org/
specs:
- actionmailer (4.1.8)
- actionpack (= 4.1.8)
- actionview (= 4.1.8)
+ actionmailer (4.1.13)
+ actionpack (= 4.1.13)
+ actionview (= 4.1.13)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.8)
- actionview (= 4.1.8)
- activesupport (= 4.1.8)
+ actionpack (4.1.13)
+ actionview (= 4.1.13)
+ activesupport (= 4.1.13)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.8)
- activesupport (= 4.1.8)
+ actionview (4.1.13)
+ activesupport (= 4.1.13)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.8)
- activesupport (= 4.1.8)
+ activemodel (4.1.13)
+ activesupport (= 4.1.13)
builder (~> 3.1)
- activerecord (4.1.8)
- activemodel (= 4.1.8)
- activesupport (= 4.1.8)
+ activerecord (4.1.13)
+ activemodel (= 4.1.13)
+ activesupport (= 4.1.13)
arel (~> 5.0.0)
- activesupport (4.1.8)
+ activesupport (4.1.13)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
- bootstrap-sass (3.3.1.0)
- sass (~> 3.2)
+ autoprefixer-rails (5.2.1.3)
+ execjs
+ json
+ bootstrap-sass (3.3.5)
+ autoprefixer-rails (>= 5.0.0.1)
+ sass (>= 3.2.19)
builder (3.2.2)
- daemons (1.1.9)
+ daemons (1.2.3)
erubis (2.7.0)
- eventmachine (1.0.3)
- execjs (2.2.2)
+ eventmachine (1.0.8)
+ execjs (2.6.0)
hike (1.2.3)
- i18n (0.6.11)
- jquery-rails (3.1.2)
+ i18n (0.7.0)
+ jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.1)
+ json (1.8.3)
mail (2.6.3)
mime-types (>= 1.16, < 3)
- mime-types (2.4.3)
- minitest (5.4.3)
- multi_json (1.10.1)
- pg (0.17.1)
- rack (1.5.2)
- rack-test (0.6.2)
+ mime-types (2.6.1)
+ minitest (5.8.0)
+ multi_json (1.11.2)
+ pg (0.18.2)
+ rack (1.5.5)
+ rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.8)
- actionmailer (= 4.1.8)
- actionpack (= 4.1.8)
- actionview (= 4.1.8)
- activemodel (= 4.1.8)
- activerecord (= 4.1.8)
- activesupport (= 4.1.8)
+ rails (4.1.13)
+ actionmailer (= 4.1.13)
+ actionpack (= 4.1.13)
+ actionview (= 4.1.13)
+ activemodel (= 4.1.13)
+ activerecord (= 4.1.13)
+ activesupport (= 4.1.13)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.8)
+ railties (= 4.1.13)
sprockets-rails (~> 2.0)
- railties (4.1.8)
- actionpack (= 4.1.8)
- activesupport (= 4.1.8)
+ railties (4.1.13)
+ actionpack (= 4.1.13)
+ activesupport (= 4.1.13)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.3.2)
+ rake (10.4.2)
sass (3.2.19)
- sass-rails (4.0.4)
+ sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
- sprockets (~> 2.8, < 2.12)
+ sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
- sprockets (2.11.3)
+ simple_form (3.1.0)
+ actionpack (~> 4.0)
+ activemodel (~> 4.0)
+ sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.2.0)
+ sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@@ -96,11 +94,11 @@ GEM
eventmachine (~> 1.0)
rack (~> 1.0)
thor (0.19.1)
- thread_safe (0.3.4)
+ thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.5.3)
+ uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
@@ -114,7 +112,10 @@ DEPENDENCIES
pg
rails (~> 4.1.0)
sass-rails (~> 4.0.2)
- simple_form (~> 3.1.0.rc1)!
+ simple_form (~> 3.1.0)
sqlite3
thin
uglifier
+
+BUNDLED WITH
+ 1.10.6

0 comments on commit 372f71a

Please sign in to comment.