diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-12-22 16:19:02 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-22 16:19:02 -0500 |
| commit | 26fa1524f7e5ba10d0ad9f2c2ab5c5a5daaeae69 (patch) | |
| tree | 9a42c9ed62d5b8449b6666c99450b81622a2047e /Gemfile.lock | |
| parent | 3b61dc47ec377b857b66f9b2a81a183276163f4e (diff) | |
| download | gitlab-ce-26fa1524f7e5ba10d0ad9f2c2ab5c5a5daaeae69.tar.gz | |
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b8517d932a4..6af805099f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -372,15 +372,16 @@ GEM inflecto (0.0.2) ipaddress (0.8.0) jquery-atwho-rails (1.3.2) - jquery-rails (3.1.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.5) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) railties (> 3.1, < 5.0) jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - jquery-ui-rails (4.2.1) + jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) jwt (1.5.2) @@ -878,10 +879,10 @@ DEPENDENCIES html-pipeline (~> 1.11.0) httparty (~> 0.13.3) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 3.1.3) + jquery-rails (~> 4.0.0) jquery-scrollto-rails (~> 1.4.3) jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 4.2.1) + jquery-ui-rails (~> 5.0.0) kaminari (~> 0.16.3) letter_opener (~> 1.1.2) mail_room (~> 0.6.1) |