diff options
| author | Pirate Praveen <praveen@debian.org> | 2019-03-04 16:31:34 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-18 12:08:48 +0100 |
| commit | c122014fd3978b8398ead838fa51eea947872a45 (patch) | |
| tree | e6e1083894fd64425672e3bbcd7aaae54fd307d6 | |
| parent | a52d7dfaa9b72e4442a1723d30b84bc349b27215 (diff) | |
| download | gitlab-ce-c122014fd3978b8398ead838fa51eea947872a45.tar.gz | |
Update acts-as-taggable-on 5.0 -> 6.0
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -158,7 +158,7 @@ end gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 5.0' +gem 'acts-as-taggable-on', '~> 6.0' # Background jobs gem 'sidekiq', '~> 5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index ec34d3f9d67..be1fc37e968 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,8 +43,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (5.0.0) - activerecord (>= 4.2.8) + acts-as-taggable-on (6.0.0) + activerecord (~> 5.0) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -948,7 +948,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 1.0) - acts-as-taggable-on (~> 5.0) + acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) akismet (~> 2.0) asana (~> 0.8.1) diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index fa54fc17d95..a0aab9fcbaf 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -117,6 +117,7 @@ excluded_attributes: - :description_html - :repository_languages - :bfg_object_map + - :tag_list namespaces: - :runners_token - :runners_token_encrypted |