Merge branch '58876-mg-remove-jquery-atwho-gem' into 'master'
Resolve "Remove jquery-atwho-rails gem" Closes #58876 See merge request gitlab-org/gitlab-ce!26058
Showing
... | @@ -265,7 +265,6 @@ gem 'addressable', '~> 2.5.2' | ... | @@ -265,7 +265,6 @@ gem 'addressable', '~> 2.5.2' |
gem 'font-awesome-rails', '~> 4.7' | gem 'font-awesome-rails', '~> 4.7' | ||
gem 'gemojione', '~> 3.3' | gem 'gemojione', '~> 3.3' | ||
gem 'gon', '~> 6.2' | gem 'gon', '~> 6.2' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | |||
gem 'request_store', '~> 1.3' | gem 'request_store', '~> 1.3' | ||
gem 'virtus', '~> 1.0.1' | gem 'virtus', '~> 1.0.1' | ||
gem 'base32', '~> 0.3.0' | gem 'base32', '~> 0.3.0' | ||
... | ... |
... | @@ -33,6 +33,7 @@ | ... | @@ -33,6 +33,7 @@ |
"@gitlab/ui": "^2.2.3", | "@gitlab/ui": "^2.2.3", | ||
"apollo-boost": "^0.3.1", | "apollo-boost": "^0.3.1", | ||
"apollo-client": "^2.5.1", | "apollo-client": "^2.5.1", | ||
"at.js": "^1.5.4", | |||
"autosize": "^4.0.0", | "autosize": "^4.0.0", | ||
"axios": "^0.17.1", | "axios": "^0.17.1", | ||
"babel-loader": "^8.0.5", | "babel-loader": "^8.0.5", | ||
... | @@ -75,6 +76,7 @@ | ... | @@ -75,6 +76,7 @@ |
"jest-transform-graphql": "^2.1.0", | "jest-transform-graphql": "^2.1.0", | ||
"jquery": "^3.2.1", | "jquery": "^3.2.1", | ||
"jquery-ujs": "1.2.2", | "jquery-ujs": "1.2.2", | ||
"jquery.caret": "^0.3.1", | |||
"jquery.waitforimages": "^2.2.0", | "jquery.waitforimages": "^2.2.0", | ||
"js-cookie": "^2.1.3", | "js-cookie": "^2.1.3", | ||
"jszip": "^3.1.3", | "jszip": "^3.1.3", | ||
... | ... |
Please register or sign in to comment