Merge branch 'dz-remove-repo-version' into 'master'
Remove `Repository#version` method and tests Closes #24251 See merge request !10734
This commit is contained in:
commit
0567f076c4
4 changed files with 5 additions and 14 deletions
|
@ -19,7 +19,7 @@ class Repository
|
|||
#
|
||||
# For example, for entry `:readme` there's a method called `readme` which
|
||||
# stores its data in the `readme` cache key.
|
||||
CACHED_METHODS = %i(size commit_count readme version contribution_guide
|
||||
CACHED_METHODS = %i(size commit_count readme contribution_guide
|
||||
changelog license_blob license_key gitignore koding_yml
|
||||
gitlab_ci_yml branch_names tag_names branch_count
|
||||
tag_count avatar exists? empty? root_ref).freeze
|
||||
|
@ -32,7 +32,6 @@ class Repository
|
|||
changelog: :changelog,
|
||||
license: %i(license_blob license_key),
|
||||
contributing: :contribution_guide,
|
||||
version: :version,
|
||||
gitignore: :gitignore,
|
||||
koding: :koding_yml,
|
||||
gitlab_ci: :gitlab_ci_yml,
|
||||
|
@ -530,11 +529,6 @@ class Repository
|
|||
end
|
||||
cache_method :readme
|
||||
|
||||
def version
|
||||
file_on_head(:version)
|
||||
end
|
||||
cache_method :version
|
||||
|
||||
def contribution_guide
|
||||
file_on_head(:contributing)
|
||||
end
|
||||
|
|
4
changelogs/unreleased/dz-remove-repo-version.yml
Normal file
4
changelogs/unreleased/dz-remove-repo-version.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Remove Repository#version method and tests
|
||||
merge_request: 10734
|
||||
author:
|
|
@ -66,12 +66,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps
|
|||
expect(page).not_to have_link('Remove avatar')
|
||||
end
|
||||
|
||||
step 'I should see project "Shop" version' do
|
||||
page.within '.project-side' do
|
||||
expect(page).to have_content '6.7.0.pre'
|
||||
end
|
||||
end
|
||||
|
||||
step 'change project default branch' do
|
||||
select 'fix', from: 'project_default_branch'
|
||||
click_button 'Save changes'
|
||||
|
|
|
@ -1259,7 +1259,6 @@ describe Repository, models: true do
|
|||
:changelog,
|
||||
:license,
|
||||
:contributing,
|
||||
:version,
|
||||
:gitignore,
|
||||
:koding,
|
||||
:gitlab_ci,
|
||||
|
|
Loading…
Reference in a new issue