summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-02-25 08:06:19 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-02-25 08:06:19 -0500
commit081d1375caaf64b6ccf4ffbbc789ad0eacbc6f34 (patch)
treec8fc858efb3bda50921912e896f6ad4922740620
parent3e1e919d196bf43ec1f99c13ecb8101c801b7d64 (diff)
downloadgitlab-ce-todos_vue.tar.gz
Removes active model serializer from gemfiletodos_vue
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
2 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 64aabd36e21..41abb17f050 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,7 +67,6 @@ gem "github-linguist", "~> 4.7.0", require: "linguist"
gem 'grape', '~> 0.13.0'
gem 'grape-entity', '~> 0.4.2'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
-gem 'active_model_serializers', '~> 0.9.4'
# Pagination
gem "kaminari", "~> 0.16.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 14d727b95e3..e2e290b3dc2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,8 +23,6 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- active_model_serializers (0.9.4)
- activemodel (>= 3.2)
activejob (4.2.5.1)
activesupport (= 4.2.5.1)
globalid (>= 0.3.0)
@@ -878,7 +876,6 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 2.0.1)
- active_model_serializers (~> 0.9.4)
activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (~> 0.1.0)
acts-as-taggable-on (~> 3.4)