diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-15 16:15:35 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-15 16:15:35 +0000 |
| commit | b53c42774c5060fb0ba36b0a728b16434336030d (patch) | |
| tree | 04a044722dfe2e4569c7e0d3c4b3ae3070ad3c31 | |
| parent | 332a9bc85ac1ff10c9874d15c9f37d23e4600dbe (diff) | |
| parent | a93662ffa83aa6a9c923f2a72d216db820a2910d (diff) | |
| download | gitlab-ce-b53c42774c5060fb0ba36b0a728b16434336030d.tar.gz | |
Merge branch '44306-drop-jquery-rails' into 'master'
Drop jquery-rails gem from Gemfile
Closes #44306
See merge request gitlab-org/gitlab-ce!17771
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 0 insertions, 6 deletions
@@ -257,7 +257,6 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.3.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 dbaf6a93ff8..fcc6ef8468c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -426,10 +426,6 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.3.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) json (1.8.6) json-jwt (1.7.2) activesupport @@ -1089,7 +1085,6 @@ DEPENDENCIES influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) |