diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 59da9599d..40076056d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,7 +138,7 @@ GEM sass (~> 3.2) foreigner (1.6.0) activerecord (>= 3.0.0) - formtastic (2.2.1) + formtastic (2.3.1) actionpack (>= 3.0) geokit (1.6.7) multi_json (>= 1.3.2) @@ -240,7 +240,8 @@ GEM railties (= 3.2.18) rails-assets-bootstrap (3.1.1) rails-assets-jquery (>= 1.9.0) - rails-assets-bootstrap-sass-official (3.1.1.2) + rails-assets-bootstrap-sass-official (3.3.0) + rails-assets-jquery (>= 1.9.0) rails-assets-eonasdan-bootstrap-datetimepicker (3.1.3) rails-assets-bootstrap (>= 3.0) rails-assets-jquery (>= 1.8.3) @@ -333,7 +334,7 @@ GEM activemodel (~> 3.0) spreadsheet (0.9.7) ruby-ole (>= 1.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -399,7 +400,7 @@ DEPENDENCIES dr-apartment factory_girl_rails (= 1.7) font-awesome-sass (~> 4.2.0) - formtastic + formtastic (= 2.3.1) georuby-ext (= 0.0.5) google-analytics-rails gravatar_image_tag @@ -420,7 +421,7 @@ DEPENDENCIES pg (~> 0.11.0) rabl rails (= 3.2.18) - rails-assets-bootstrap-sass-official (~> 3.1.1) + rails-assets-bootstrap-sass-official (~> 3.3.0) rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3) rails-assets-respond rails-assets-tagmanager (~> 3.0.1.0) @@ -438,7 +439,7 @@ DEPENDENCIES rubyzip (~> 1.1.6) sass-rails (~> 3.2.3) shoulda-matchers - simple_form + simple_form (= 2.1.1) sqlite3 squeel therubyracer (~> 0.10.2) |