Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update simple form master and bump rails to 3.2.1

  • Loading branch information...
commit c1f6ad6a074533fe744613a1dbdea426d5b5fe54 1 parent 0d174ce
@carlosantoniodasilva carlosantoniodasilva authored
Showing with 31 additions and 44 deletions.
  1. +3 −16 Gemfile
  2. +28 −28 Gemfile.lock
View
19 Gemfile
@@ -1,9 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.0'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'rails', '~> 3.2.1'
gem 'json'
gem 'thin'
@@ -14,20 +11,10 @@ end
gem 'jquery-rails'
-gem 'simple_form', :git => 'git://github.com/plataformatec/simple_form.git'
+gem 'simple_form', git: 'git://github.com/plataformatec/simple_form.git'
group :production do
gem 'pg'
end
-gem 'sqlite3', :group => [:test, :development]
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'
-
+gem 'sqlite3', group: [:test, :development]
View
56 Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/plataformatec/simple_form.git
- revision: 2505d54a3466c22ce9a99a7aab385a9aa6c2aa8a
+ revision: 099efb4d55d8d993961ff5c2446bb9715ae5df29
specs:
simple_form (2.0.0.dev)
actionpack (~> 3.0)
@@ -9,31 +9,31 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.0)
- actionpack (= 3.2.0)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
mail (~> 2.4.0)
- actionpack (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0)
+ journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- activerecord (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- activesupport (3.2.0)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.0)
@@ -45,7 +45,7 @@ GEM
multi_json (~> 1.0)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.0)
+ journey (1.0.1)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
@@ -65,17 +65,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.0)
- actionmailer (= 3.2.0)
- actionpack (= 3.2.0)
- activerecord (= 3.2.0)
- activeresource (= 3.2.0)
- activesupport (= 3.2.0)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.2.0)
- railties (3.2.0)
- actionpack (= 3.2.0)
- activesupport (= 3.2.0)
+ railties (= 3.2.1)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -109,7 +109,7 @@ DEPENDENCIES
jquery-rails
json
pg
- rails (= 3.2.0)
+ rails (~> 3.2.1)
simple_form!
sqlite3
thin
Please sign in to comment.
Something went wrong with that request. Please try again.