diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-31 08:01:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-31 08:01:56 +0000 |
| commit | ee3b5923a55b94631fa31bb1e8c1a5d7774bda71 (patch) | |
| tree | 2a37dc381d2a8fc2384fa80ceca5bd222603379e /app | |
| parent | 5116d11a6192e469ba09103507b1e0cb8d777326 (diff) | |
| parent | 4d3f7ae1ef5881869140f0c4a5865f65569db26a (diff) | |
| download | gitlab-ce-ee3b5923a55b94631fa31bb1e8c1a5d7774bda71.tar.gz | |
Merge branch 'fj-36819-remove-v3-api' into 'master'
Removal of API v3 from the codebase
Closes #36819
See merge request gitlab-org/gitlab-ce!18970
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/application_setting.rb | 11 | ||||
| -rw-r--r-- | app/models/concerns/project_features_compatibility.rb | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index b12f7a2c83f..3d58a14882f 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -360,17 +360,6 @@ class ApplicationSetting < ActiveRecord::Base Array(read_attribute(:repository_storages)) end - # DEPRECATED - # repository_storage is still required in the API. Remove in 9.0 - # Still used in API v3 - def repository_storage - repository_storages.first - end - - def repository_storage=(value) - self.repository_storages = [value] - end - def default_project_visibility=(level) super(Gitlab::VisibilityLevel.level_value(level)) end diff --git a/app/models/concerns/project_features_compatibility.rb b/app/models/concerns/project_features_compatibility.rb index b3fec99c816..1f7d78a2efe 100644 --- a/app/models/concerns/project_features_compatibility.rb +++ b/app/models/concerns/project_features_compatibility.rb @@ -1,4 +1,4 @@ -# Makes api V3 compatible with old project features permissions methods +# Makes api V4 compatible with old project features permissions methods # # After migrating issues_enabled merge_requests_enabled builds_enabled snippets_enabled and wiki_enabled # fields to a new table "project_features", support for the old fields is still needed in the API. |