diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 12:01:22 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 12:01:22 +0200 |
| commit | d4e9c7584466d5275858ad3cf1d401891625aa1a (patch) | |
| tree | 64faa1ce0c1be4d21db2305546433ede0874a557 /Gemfile.lock | |
| parent | 5da8c1f77a7a6f65366c02d17af763c0e19996bf (diff) | |
| parent | 94a55045dc0a838701884731ac88eb078319ccb1 (diff) | |
| download | gitlab-ce-d4e9c7584466d5275858ad3cf1d401891625aa1a.tar.gz | |
Merge remote-tracking branch 'origin/master' into emoji-picker-search
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 21f405de2f2..7477b42f2d8 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) @@ -879,10 +880,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) |