summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock143
1 files changed, 83 insertions, 60 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d8531cd..1a120fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,12 @@
-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:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -23,30 +14,33 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
- acts_as_list (0.1.9)
+ acts_as_list (0.2.0)
+ activerecord (>= 3.0)
+ addressable (2.3.3)
arel (3.0.2)
- backup (3.0.27)
+ backup (3.1.3)
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,31 +49,41 @@ 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)
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
+ cookiejar (0.3.0)
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)
+ em-http-request (1.0.3)
+ addressable (>= 2.2.3)
+ cookiejar
+ em-socksify
+ eventmachine (>= 1.0.0.beta.4)
+ http_parser.rb (>= 0.5.3)
+ em-socksify (0.2.1)
+ eventmachine (>= 1.0.0.beta.4)
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)
@@ -87,12 +91,22 @@ GEM
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
+ faye (0.8.9)
+ cookiejar (>= 0.3.0)
+ em-http-request (>= 0.3.0)
+ eventmachine (>= 0.12.0)
+ faye-websocket (>= 0.4.0)
+ rack (>= 1.0.0)
+ yajl-ruby (>= 1.0.0)
+ faye-websocket (0.4.7)
+ eventmachine (>= 0.12.0)
fssm (0.2.10)
haml (4.0.0)
tilt
hike (1.2.1)
hirb (0.7.1)
http_accept_language (1.0.2)
+ http_parser.rb (0.5.3)
i18n (0.6.1)
inifile (2.0.2)
journey (1.0.4)
@@ -103,20 +117,22 @@ GEM
kgio (2.8.0)
macaddr (1.6.1)
systemu (~> 2.5.0)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
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.7.1)
mysql2 (0.3.11)
- nokogiri (1.5.6)
+ nokogiri (1.5.7)
open4 (1.3.0)
polyglot (0.3.3)
- quiet_assets (1.0.1)
- railties (~> 3.1)
+ private_pub (1.0.3)
+ faye
+ quiet_assets (1.0.2)
+ railties (>= 3.1, < 5.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
@@ -124,26 +140,26 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
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 +167,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,35 +177,37 @@ 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)
subexec (0.2.2)
systemu (2.5.2)
- thin (1.5.0)
+ thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
- tilt (1.3.3)
+ tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
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)
chronic (>= 0.6.3)
+ whois (2.7.0)
will_paginate (3.0.4)
+ yajl-ruby (1.1.0)
PLATFORMS
ruby
@@ -217,11 +238,12 @@ DEPENDENCIES
mini_magick
mysql2
nokogiri
+ private_pub
quiet_assets
- rails (= 3.2.12)
+ rails (= 3.2.13)
sass-rails
sextant
- simple_form!
+ simple_form (~> 2.1.0)
sqlite3
state_machine
strong_parameters
@@ -230,4 +252,5 @@ DEPENDENCIES
unicorn
uuid
whenever
+ whois
will_paginate