summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-12-06 16:02:53 -0700
committerConnor Shea <connor.james.shea@gmail.com>2016-12-06 16:02:53 -0700
commit2e26ca1f986c913893b0123aad654879a5560d35 (patch)
treee59f4b85901ec7e2bcba26e6ec76bafd0899dd44
parent180f87cab7c530852c049e130e9297267e006010 (diff)
downloadgitlab-ce-2e26ca1f986c913893b0123aad654879a5560d35.tar.gz
Update jquery-ui-rails from 5.0.5 to 6.0.1.
Changelog: https://github.com/jquery-ui-rails/jquery-ui-rails/blob/3bc41f13b4611e8445ca885dc5016bf6c3454a8f/History.md#601 Changelog for jQuery UI: https://jqueryui.com/upgrade-guide/1.12/ See #25302.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f49ef0386e7..e96ba252c93 100644
--- a/Gemfile
+++ b/Gemfile
@@ -226,7 +226,7 @@ gem 'gemojione', '~> 3.0'
gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
-gem 'jquery-ui-rails', '~> 5.0.0'
+gem 'jquery-ui-rails', '~> 6.0.1'
gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a024e81ad2..7cf7dfcf2df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -339,7 +339,7 @@ GEM
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
- jquery-ui-rails (5.0.5)
+ jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.3)
json-schema (2.6.2)
@@ -854,7 +854,7 @@ DEPENDENCIES
jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 4.1.0)
jquery-turbolinks (~> 2.1.0)
- jquery-ui-rails (~> 5.0.0)
+ jquery-ui-rails (~> 6.0.1)
json-schema (~> 2.6.2)
jwt
kaminari (~> 0.17.0)