summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock59
2 files changed, 31 insertions, 33 deletions
diff --git a/Gemfile b/Gemfile
index e4e839f..f975133 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,8 +54,7 @@ group :test do
end
gem 'haml'
-# gem 'simple_form', '~> 2.0.1'
-gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1'
+gem 'simple_form', '~> 2.1.0'
# Image Upload
gem 'carrierwave'
@@ -80,6 +79,8 @@ gem 'uuid'
# Application server
gem 'unicorn'
+# Thin is needed for the Private Pub stuff.
+# http://railscasts.com/episodes/316-private-pub
gem 'thin'
# Backup https://github.com/meskyanichi/backup
diff --git a/Gemfile.lock b/Gemfile.lock
index d8531cd..2ca007c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
- remote: git://github.com/plataformatec/simple_form.git
- revision: e3da7301dcf6feb9a1db275ff5cb3f85afce0e80
- branch: v2.1
- specs:
- simple_form (2.1.0.dev)
- actionpack (~> 3.0)
- activemodel (~> 3.0)
-
GEM
remote: http://rubygems.org/
specs:
@@ -37,16 +28,18 @@ GEM
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
- acts_as_list (0.1.9)
+ acts_as_list (0.2.0)
+ activerecord (>= 3.0)
arel (3.0.2)
- backup (3.0.27)
+ backup (3.1.2)
open4 (~> 1.3.0)
thor (>= 0.15.4, < 2)
bcrypt-ruby (3.0.1)
- better_errors (0.5.0)
+ better_errors (0.7.2)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
- binding_of_caller (0.6.8)
+ binding_of_caller (0.7.1)
+ debug_inspector (>= 0.0.1)
breadcrumbs_on_rails (2.3.0)
builder (3.0.4)
cache_digests (0.2.0)
@@ -55,16 +48,16 @@ GEM
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- chronic (0.9.0)
+ chronic (0.9.1)
chunky_png (1.2.7)
- coderay (1.0.8)
+ coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.4.0)
+ coffee-script-source (1.6.1)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -73,13 +66,14 @@ GEM
compass (>= 0.12.2, < 0.14)
daemons (1.1.9)
dalli (2.6.2)
+ debug_inspector (0.0.2)
delayed_job (3.0.5)
activesupport (~> 3.0)
- delayed_job_active_record (0.4.1)
+ delayed_job_active_record (0.4.3)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
erubis (2.7.0)
- eventmachine (1.0.0)
+ eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
@@ -93,7 +87,7 @@ GEM
hike (1.2.1)
hirb (0.7.1)
http_accept_language (1.0.2)
- i18n (0.6.1)
+ i18n (0.6.4)
inifile (2.0.2)
journey (1.0.4)
jquery-rails (2.2.1)
@@ -108,15 +102,15 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.21)
- mini_magick (3.4)
+ mini_magick (3.5.0)
subexec (~> 0.2.1)
- multi_json (1.6.0)
+ multi_json (1.6.1)
mysql2 (0.3.11)
nokogiri (1.5.6)
open4 (1.3.0)
polyglot (0.3.3)
- quiet_assets (1.0.1)
- railties (~> 3.1)
+ quiet_assets (1.0.2)
+ railties (>= 3.1, < 5.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
@@ -141,9 +135,9 @@ GEM
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
json (~> 1.4)
- sass (3.2.5)
+ sass (3.2.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -151,6 +145,9 @@ GEM
sextant (0.2.3)
activesupport (>= 3.2)
rails (>= 3.2)
+ simple_form (2.1.0)
+ actionpack (~> 3.0)
+ activemodel (~> 3.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -158,7 +155,7 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
state_machine (1.1.2)
- strong_parameters (0.1.6)
+ strong_parameters (0.2.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
railties (~> 3.0)
@@ -169,19 +166,19 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
- tilt (1.3.3)
+ tilt (1.3.5)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.6.0)
+ unicorn (4.6.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- uuid (2.3.6)
+ uuid (2.3.7)
macaddr (~> 1.0)
whenever (0.8.2)
activesupport (>= 2.3.4)
@@ -221,7 +218,7 @@ DEPENDENCIES
rails (= 3.2.12)
sass-rails
sextant
- simple_form!
+ simple_form (~> 2.1.0)
sqlite3
state_machine
strong_parameters