summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalasankar "Balu" C <balasankar@gitlab.com>2018-03-15 20:09:54 +0530
committerBalasankar "Balu" C <balasankar@gitlab.com>2018-03-15 20:09:54 +0530
commita93662ffa83aa6a9c923f2a72d216db820a2910d (patch)
treebd0d4550ebd55e71efad8085c8f75e15a8268797
parent81d370d419cf7799128dd8498a5a8c21d220acb7 (diff)
downloadgitlab-ce-a93662ffa83aa6a9c923f2a72d216db820a2910d.tar.gz
Remove jquery-rails from Gemfile
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock5
2 files changed, 0 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 6d3999e3243..2324e29a131 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)