summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-10 22:46:48 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-10 22:46:48 +0000
commit0026ec392ebcfc5dbb6fd6efd353b24c337b2109 (patch)
treeb8d9d780c8fbfbc03df1580ed22941a1369955ea
parentae2d6e4757f8264559b5a2ad98b08280b8cd5af1 (diff)
parent4fff9d27d24ef1d959784cfa64d9a3189351c6ce (diff)
downloadgitlab-ce-0026ec392ebcfc5dbb6fd6efd353b24c337b2109.tar.gz
Merge branch 'simplify-compare-page-text' into 'master'
Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions' ## What does this MR do? I remember we had a quick discussion about what to call the expected input of the compare page. Today whilst doing !6766 I found these are called [git revisions](https://git-scm.com/docs/gitrevisions). ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_14.44.13](/uploads/694200b8f56967d8e7caa965bbf7c123/Screen_Shot_2016-10-10_at_14.44.13.png) Dunno where that gradient came :laughing: Screenshot issue not code. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6774
-rw-r--r--app/views/projects/compare/index.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index e9ff8e90dd5..45be6581cfc 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -4,7 +4,7 @@
%div{ class: container_class }
.sub-header-block
- Compare branches, tags or commit ranges.
+ Compare Git revisions.
%br
Fill input field with commit id like
%code.label-branch 4eedf23