diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-17 07:18:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-17 09:21:36 +0200 |
| commit | aa6aa2e9eacbbede07cda7e8567169c6866825a2 (patch) | |
| tree | 6dc9f6153f42800c9ade74ff5d41559b125ed749 /Gemfile | |
| parent | 41aead60c65b32c86487fc07867995c0cf5c4805 (diff) | |
| download | gitlab-ce-aa6aa2e9eacbbede07cda7e8567169c6866825a2.tar.gz | |
Merge branch 'rs-rails-update' into 'master'bump-gems
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
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "~> 4.1.0" +gem 'rails', '4.1.11' # Default values for AR models gem "default_value_for", "~> 3.0.0" @@ -193,7 +193,7 @@ gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.1' gem 'gon', '~> 5.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-ui-rails' gem 'nprogress-rails' |