Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-21 18:11:13 +0300
committerFatih Acet <acetfatih@gmail.com>2016-09-21 18:11:13 +0300
commitab49c1a3a326ad44cc3481becf0cad9095205703 (patch)
tree524a9906eeb2f762b4254870e4d68051cbfb87b0
parent94bb16aeabb198b64f07890d8d0073890b7e5758 (diff)
parentbc08960bfd601229281f10348f97b30a6e005454 (diff)
Merge branch 'correct-builds-pipeline-commit-header-to-build-header' into 'master'
Changed `Commit` to `Build` header on builds table ## What does this MR do? As [discussed here](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6322#note_15511777) the pipeline table `Commit` headers should be `Pipeline`. This also should apply to build table headers. ## Are there points in the code the reviewer needs to double check? /cc @tauriedavis ## Why was this MR needed? UI consistency ## Screenshots (if relevant) ![Screen_Shot_2016-09-18_at_16.39.16](/uploads/61e64fb3152ac3ec81bec35c5ba0e312/Screen_Shot_2016-09-18_at_16.39.16.png) ## 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 you do - 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 !6402
-rw-r--r--app/views/projects/builds/_table.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/builds/_table.html.haml b/app/views/projects/builds/_table.html.haml
index 61eff73da26..c2bcfb773a6 100644
--- a/app/views/projects/builds/_table.html.haml
+++ b/app/views/projects/builds/_table.html.haml
@@ -9,7 +9,7 @@
%thead
%tr
%th Status
- %th Commit
+ %th Build
- if admin
%th Project
%th Runner