diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-01 10:37:06 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-01 10:37:06 +0000 |
| commit | 97e2de1d6ef04038510cb5d24c1033c117f535be (patch) | |
| tree | e16126c54781131ad2bfbee69dd4dcf3d071ba9f | |
| parent | 6e6aa12ebeeaca235406202e690a5b740e17152b (diff) | |
| parent | 18324261097de835628570696594f749e48d3747 (diff) | |
| download | gitlab-ce-97e2de1d6ef04038510cb5d24c1033c117f535be.tar.gz | |
Merge branch 'bvl-remove-sha-from-help' into 'master'
Link to the tag from a version instead of commit
Closes gitlab-org/release/tasks#459
See merge request gitlab-org/gitlab-ce!22015
| -rw-r--r-- | app/views/help/index.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/bvl-remove-sha-from-help.yml | 5 | ||||
| -rw-r--r-- | spec/views/help/index.html.haml_spec.rb | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 7a66bac09cb..198c2d35b29 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -7,8 +7,7 @@ GitLab Community Edition - if user_signed_in? - %span= Gitlab::VERSION - %small= link_to Gitlab.revision, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab.revision) + %span= link_to Gitlab::VERSION, Gitlab::COM_URL + namespace_project_tag_path('gitlab-org', 'gitlab-ce', "v#{Gitlab::VERSION}") = version_status_badge %hr diff --git a/changelogs/unreleased/bvl-remove-sha-from-help.yml b/changelogs/unreleased/bvl-remove-sha-from-help.yml new file mode 100644 index 00000000000..37f797f98f4 --- /dev/null +++ b/changelogs/unreleased/bvl-remove-sha-from-help.yml @@ -0,0 +1,5 @@ +--- +title: Link to the tag for a version on the help page instead of to the commit +merge_request: 22015 +author: +type: changed diff --git a/spec/views/help/index.html.haml_spec.rb b/spec/views/help/index.html.haml_spec.rb index 4b4de540d9e..c8c9c4e773d 100644 --- a/spec/views/help/index.html.haml_spec.rb +++ b/spec/views/help/index.html.haml_spec.rb @@ -21,7 +21,7 @@ describe 'help/index' do render expect(rendered).to match '8.0.2' - expect(rendered).to have_link('abcdefg', href: 'https://gitlab.com/gitlab-org/gitlab-ce/commits/abcdefg') + expect(rendered).to have_link('8.0.2', href: 'https://gitlab.com/gitlab-org/gitlab-ce/tags/v8.0.2') end end |