Commit b0821a13 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'rs-rails-update' into 'master'

Bump rails to 4.1.11, jquery-rails to 3.1.3

rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/

jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY

See merge request !830
parents 89bcc1ba 68e77a36
source "https://rubygems.org" source "https://rubygems.org"
gem "rails", "~> 4.1.0" gem 'rails', '4.1.11'
# Default values for AR models # Default values for AR models
gem "default_value_for", "~> 3.0.0" gem "default_value_for", "~> 3.0.0"
...@@ -193,7 +193,7 @@ gem 'font-awesome-rails', '~> 4.2' ...@@ -193,7 +193,7 @@ gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1' gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 5.0.0' gem 'gon', '~> 5.0.0'
gem 'jquery-atwho-rails', '~> 1.0.0' gem 'jquery-atwho-rails', '~> 1.0.0'
gem 'jquery-rails', '3.1.2' gem 'jquery-rails', '3.1.3'
gem 'jquery-scrollto-rails' gem 'jquery-scrollto-rails'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
gem 'nprogress-rails' gem 'nprogress-rails'
......
...@@ -4,31 +4,31 @@ GEM ...@@ -4,31 +4,31 @@ GEM
CFPropertyList (2.3.1) CFPropertyList (2.3.1)
RedCloth (4.2.9) RedCloth (4.2.9)
ace-rails-ap (2.0.1) ace-rails-ap (2.0.1)
actionmailer (4.1.9) actionmailer (4.1.11)
actionpack (= 4.1.9) actionpack (= 4.1.11)
actionview (= 4.1.9) actionview (= 4.1.11)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.9) actionpack (4.1.11)
actionview (= 4.1.9) actionview (= 4.1.11)
activesupport (= 4.1.9) activesupport (= 4.1.11)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.9) actionview (4.1.11)
activesupport (= 4.1.9) activesupport (= 4.1.11)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.9) activemodel (4.1.11)
activesupport (= 4.1.9) activesupport (= 4.1.11)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.9) activerecord (4.1.11)
activemodel (= 4.1.9) activemodel (= 4.1.11)
activesupport (= 4.1.9) activesupport (= 4.1.11)
arel (~> 5.0.0) arel (~> 5.0.0)
activeresource (4.0.0) activeresource (4.0.0)
activemodel (~> 4.0) activemodel (~> 4.0)
activesupport (~> 4.0) activesupport (~> 4.0)
rails-observers (~> 0.1.1) rails-observers (~> 0.1.1)
activesupport (4.1.9) activesupport (4.1.11)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -331,7 +331,7 @@ GEM ...@@ -331,7 +331,7 @@ GEM
inflecto (0.0.2) inflecto (0.0.2)
ipaddress (0.8.0) ipaddress (0.8.0)
jquery-atwho-rails (1.0.1) jquery-atwho-rails (1.0.1)
jquery-rails (3.1.2) jquery-rails (3.1.3)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-scrollto-rails (1.4.3) jquery-scrollto-rails (1.4.3)
...@@ -341,7 +341,7 @@ GEM ...@@ -341,7 +341,7 @@ GEM
turbolinks turbolinks
jquery-ui-rails (4.2.1) jquery-ui-rails (4.2.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.2) json (1.8.3)
jwt (0.1.13) jwt (0.1.13)
multi_json (>= 1.5) multi_json (>= 1.5)
kaminari (0.15.1) kaminari (0.15.1)
...@@ -366,7 +366,7 @@ GEM ...@@ -366,7 +366,7 @@ GEM
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.3.5) minitest (5.3.5)
mousetrap-rails (1.4.6) mousetrap-rails (1.4.6)
multi_json (1.10.1) multi_json (1.11.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (1.2.0) multipart-post (1.2.0)
mysql2 (0.3.16) mysql2 (0.3.16)
...@@ -449,7 +449,7 @@ GEM ...@@ -449,7 +449,7 @@ GEM
quiet_assets (1.0.2) quiet_assets (1.0.2)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
racc (1.4.10) racc (1.4.10)
rack (1.5.3) rack (1.5.4)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (4.3.0) rack-attack (4.3.0)
...@@ -469,21 +469,21 @@ GEM ...@@ -469,21 +469,21 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.9) rails (4.1.11)
actionmailer (= 4.1.9) actionmailer (= 4.1.11)
actionpack (= 4.1.9) actionpack (= 4.1.11)
actionview (= 4.1.9) actionview (= 4.1.11)
activemodel (= 4.1.9) activemodel (= 4.1.11)
activerecord (= 4.1.9) activerecord (= 4.1.11)
activesupport (= 4.1.9) activesupport (= 4.1.11)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.9) railties (= 4.1.11)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-observers (0.1.2) rails-observers (0.1.2)
activemodel (~> 4.0) activemodel (~> 4.0)
railties (4.1.9) railties (4.1.11)
actionpack (= 4.1.9) actionpack (= 4.1.11)
activesupport (= 4.1.9) activesupport (= 4.1.11)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
...@@ -633,7 +633,7 @@ GEM ...@@ -633,7 +633,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4) sprockets-rails (2.3.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
...@@ -777,7 +777,7 @@ DEPENDENCIES ...@@ -777,7 +777,7 @@ DEPENDENCIES
html-pipeline (~> 1.11.0) html-pipeline (~> 1.11.0)
httparty httparty
jquery-atwho-rails (~> 1.0.0) jquery-atwho-rails (~> 1.0.0)
jquery-rails (= 3.1.2) jquery-rails (= 3.1.3)
jquery-scrollto-rails jquery-scrollto-rails
jquery-turbolinks jquery-turbolinks
jquery-ui-rails jquery-ui-rails
...@@ -807,7 +807,7 @@ DEPENDENCIES ...@@ -807,7 +807,7 @@ DEPENDENCIES
rack-cors rack-cors
rack-mini-profiler rack-mini-profiler
rack-oauth2 (~> 1.0.5) rack-oauth2 (~> 1.0.5)
rails (~> 4.1.0) rails (= 4.1.11)
raphael-rails (~> 2.1.2) raphael-rails (~> 2.1.2)
rdoc (~> 3.6) rdoc (~> 3.6)
redcarpet (~> 3.3.0) redcarpet (~> 3.3.0)
...@@ -855,3 +855,6 @@ DEPENDENCIES ...@@ -855,3 +855,6 @@ DEPENDENCIES
virtus virtus
webmock (~> 1.21.0) webmock (~> 1.21.0)
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
BUNDLED WITH
1.10.4
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment