diff --git a/Gemfile b/Gemfile index c4307fba5..bd634d1ab 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "4.2.5.1" +gem "rails", "4.2.5.2" # Legacy Rails features, remove me! # responders (class level) @@ -56,13 +56,13 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "3.3.6" gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.4" -gem "autoprefixer-rails", "6.3.1" +gem "autoprefixer-rails", "6.3.3.1" gem "bootstrap-switch-rails", "3.3.3" # Database group :mysql, optional: true do - gem "mysql2", "0.4.2" + gem "mysql2", "0.4.3" end group :postgresql, optional: true do gem "pg", "0.18.4" @@ -90,8 +90,8 @@ gem "backbone-on-rails", "1.2.0.0" gem "handlebars_assets", "0.23.0" gem "jquery-rails", "4.1.0" gem "jquery-ui-rails", "5.0.5" -gem "js_image_paths", "0.0.2" -gem "js-routes", "1.2.3" +gem "js_image_paths", "0.1.0" +gem "js-routes", "1.2.4" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index 0d9efd893..dceeeb9ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,40 +3,40 @@ GEM remote: https://rails-assets.org/ specs: CFPropertyList (2.3.2) - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) + actionmailer (4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.1) + actionpack (4.2.5.2) + actionview (= 4.2.5.2) + activesupport (= 4.2.5.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.1) - activesupport (= 4.2.5.1) + actionview (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) active_model_serializers (0.9.4) activemodel (>= 3.2) - activejob (4.2.5.1) - activesupport (= 4.2.5.1) + activejob (4.2.5.2) + activesupport (= 4.2.5.2) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.5.2) + activemodel (= 4.2.5.2) + activesupport (= 4.2.5.2) arel (~> 6.0) activerecord-import (0.11.0) activerecord (>= 3.0) - activesupport (4.2.5.1) + activesupport (4.2.5.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -58,9 +58,8 @@ GEM astrolabe (1.3.1) parser (~> 2.2) attr_required (1.0.1) - autoprefixer-rails (6.3.1) + autoprefixer-rails (6.3.3.1) execjs - json backbone-on-rails (1.2.0.0) eco ejs @@ -445,10 +444,10 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.3) + js-routes (1.2.4) railties (>= 3.2) sprockets-rails - js_image_paths (0.0.2) + js_image_paths (0.1.0) rails (~> 4.0) jshintrb (0.3.0) execjs @@ -495,7 +494,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) messagebus_ruby_api (1.0.3) method_source (0.8.2) - mime-types (2.99) + mime-types (2.99.1) mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.8.4) @@ -506,7 +505,7 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.4.2) + mysql2 (0.4.3) naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) @@ -561,7 +560,6 @@ GEM orm_adapter (0.5.0) parser (2.3.0.4) ast (~> 2.2) - pg (0.18.4) phantomjs (2.1.1.0) powerpack (0.1.1) pronto (0.5.3) @@ -616,16 +614,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.1) + rails (4.2.5.2) + actionmailer (= 4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) + activemodel (= 4.2.5.2) + activerecord (= 4.2.5.2) + activesupport (= 4.2.5.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.1) + railties (= 4.2.5.2) sprockets-rails rails-assets-autosize (3.0.15) rails-assets-blueimp-gallery (2.17.0) @@ -694,9 +692,9 @@ GEM remotipart (~> 1.0) safe_yaml (~> 1.0) sass-rails (>= 4.0, < 6) - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.5.2) + actionpack (= 4.2.5.2) + activesupport (= 4.2.5.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) @@ -906,7 +904,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 6.3.1) + autoprefixer-rails (= 6.3.3.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 3.3.6) bootstrap-switch-rails (= 3.3.3) @@ -947,8 +945,8 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.1.0) jquery-ui-rails (= 5.0.5) - js-routes (= 1.2.3) - js_image_paths (= 0.0.2) + js-routes (= 1.2.4) + js_image_paths (= 0.1.0) jshintrb (= 0.3.0) json (= 1.8.3) json-schema (= 2.6.0) @@ -960,7 +958,7 @@ DEPENDENCIES mini_magick (= 4.4.0) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.4.2) + mysql2 (= 0.4.3) nokogiri (= 1.6.7.2) omniauth (= 1.3.1) omniauth-facebook (= 3.0.0) @@ -985,7 +983,7 @@ DEPENDENCIES rack-protection (= 1.5.3) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 4.2.5.1) + rails (= 4.2.5.2) rails-assets-autosize (= 3.0.15)! rails-assets-blueimp-gallery (= 2.17.0)! rails-assets-diaspora_jsxc (~> 0.1.5.develop)!