Commit 0567f076 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'dz-remove-repo-version' into 'master'

Remove `Repository#version` method and tests

Closes #24251

See merge request !10734
parents d69deb1d 27f519a2
...@@ -19,7 +19,7 @@ class Repository ...@@ -19,7 +19,7 @@ class Repository
# #
# For example, for entry `:readme` there's a method called `readme` which # For example, for entry `:readme` there's a method called `readme` which
# stores its data in the `readme` cache key. # 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 changelog license_blob license_key gitignore koding_yml
gitlab_ci_yml branch_names tag_names branch_count gitlab_ci_yml branch_names tag_names branch_count
tag_count avatar exists? empty? root_ref).freeze tag_count avatar exists? empty? root_ref).freeze
...@@ -32,7 +32,6 @@ class Repository ...@@ -32,7 +32,6 @@ class Repository
changelog: :changelog, changelog: :changelog,
license: %i(license_blob license_key), license: %i(license_blob license_key),
contributing: :contribution_guide, contributing: :contribution_guide,
version: :version,
gitignore: :gitignore, gitignore: :gitignore,
koding: :koding_yml, koding: :koding_yml,
gitlab_ci: :gitlab_ci_yml, gitlab_ci: :gitlab_ci_yml,
...@@ -530,11 +529,6 @@ class Repository ...@@ -530,11 +529,6 @@ class Repository
end end
cache_method :readme cache_method :readme
def version
file_on_head(:version)
end
cache_method :version
def contribution_guide def contribution_guide
file_on_head(:contributing) file_on_head(:contributing)
end end
......
---
title: Remove Repository#version method and tests
merge_request: 10734
author:
...@@ -66,12 +66,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps ...@@ -66,12 +66,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps
expect(page).not_to have_link('Remove avatar') expect(page).not_to have_link('Remove avatar')
end 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 step 'change project default branch' do
select 'fix', from: 'project_default_branch' select 'fix', from: 'project_default_branch'
click_button 'Save changes' click_button 'Save changes'
......
...@@ -1259,7 +1259,6 @@ describe Repository, models: true do ...@@ -1259,7 +1259,6 @@ describe Repository, models: true do
:changelog, :changelog,
:license, :license,
:contributing, :contributing,
:version,
:gitignore, :gitignore,
:koding, :koding,
:gitlab_ci, :gitlab_ci,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment