diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-01 20:21:42 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-01 20:21:42 +0000 |
| commit | dd929203bb9502d9547bcb45c04c8be34d8c0b3b (patch) | |
| tree | ed896c637313ac9771ecae3d35443a651140c8ad | |
| parent | e27416300fc71e84b5bc901ef7f9e9143b8b940e (diff) | |
| parent | ef20bb2edd932a8e144aded11c83046e77ea79d9 (diff) | |
| download | gitlab-ce-dd929203bb9502d9547bcb45c04c8be34d8c0b3b.tar.gz | |
Merge branch '27494-environment-list-column-headers' into 'master'
Edited the column header for the environments list from created to updated and a…
Closes #27494
See merge request !8904
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6 index fea642467fa..971be04e2d2 100644 --- a/app/assets/javascripts/environments/components/environment.js.es6 +++ b/app/assets/javascripts/environments/components/environment.js.es6 @@ -182,7 +182,7 @@ <th class="environments-deploy">Last deployment</th> <th class="environments-build">Build</th> <th class="environments-commit">Commit</th> - <th class="environments-date">Created</th> + <th class="environments-date">Updated</th> <th class="hidden-xs environments-actions"></th> </tr> </thead> diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index b23ca109746..f3179dce5f2 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -33,7 +33,7 @@ %th ID %th Commit %th Build - %th + %th Created %th.hidden-xs = render @deployments diff --git a/changelogs/unreleased/27494-environment-list-column-headers.yml b/changelogs/unreleased/27494-environment-list-column-headers.yml new file mode 100644 index 00000000000..798c01f3238 --- /dev/null +++ b/changelogs/unreleased/27494-environment-list-column-headers.yml @@ -0,0 +1,4 @@ +--- +title: Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles +merge_request: +author: |