diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 12:05:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 12:05:48 +0000 |
| commit | c53742b14d1abb4557f037d16b282ee7d26d4677 (patch) | |
| tree | 903514e984b96dbef8568f9ac950ccb952dd9a5a /Gemfile | |
| parent | 1607fba755691dbe0846d9c48e6960eee06d7f3a (diff) | |
| parent | 5ad192ced2e3daf0c6b34fee11a50351cfe0918f (diff) | |
| download | gitlab-ce-c53742b14d1abb4557f037d16b282ee7d26d4677.tar.gz | |
Merge branch 'rs-update-jquery' into 'master'
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0
Closes #2859
See merge request !2183
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -202,9 +202,9 @@ gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.2.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 3.1.3' +gem 'jquery-rails', '~> 4.0.0' gem 'jquery-scrollto-rails', '~> 1.4.3' -gem 'jquery-ui-rails', '~> 4.2.1' +gem 'jquery-ui-rails', '~> 5.0.0' gem 'nprogress-rails', '~> 0.1.6.7' gem 'raphael-rails', '~> 2.1.2' gem 'request_store', '~> 1.2.0' |