diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-01-25 22:29:01 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-01-25 22:29:01 +0000 |
commit | 06fca50687bd5d7071957ad8bbf396b212dd98f9 (patch) | |
tree | 757560ea34edf328a8d4c3d3a6310474f1c05342 | |
parent | d1eb85dd30d0f67874b55bd1c1be5d611e1644f6 (diff) | |
parent | 65be0979e48424d04820d4e78996cac538934b18 (diff) | |
download | gitlab-ce-26001-show-tags-which-contain-a-given-commit-in-their-own-metadata-row-on-the-commit-page-widget.tar.gz |
Merge branch 'display-project-id' into 'master'
26001-show-tags-which-contain-a-given-commit-in-their-own-metadata-row-on-the-commit-page-widget
Display project ID
Closes #18350
See merge request !8572
-rw-r--r-- | app/views/projects/edit.html.haml | 15 | ||||
-rw-r--r-- | changelogs/unreleased/display-project-id.yml | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 1d7fdf68cb3..114865935d6 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -7,10 +7,17 @@ .project-edit-errors = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f| %fieldset.append-bottom-0 - .form-group - = f.label :name, class: 'label-light' do - Project name - = f.text_field :name, class: "form-control", id: "project_name_edit" + .row + .form-group.col-md-9 + = f.label :name, class: 'label-light' do + Project name + = f.text_field :name, class: "form-control", id: "project_name_edit" + + .form-group.col-md-3 + = f.label :id, class: 'label-light' do + Project ID + = f.text_field :id, class: 'form-control', readonly: true + .form-group = f.label :description, class: 'label-light' do Project description diff --git a/changelogs/unreleased/display-project-id.yml b/changelogs/unreleased/display-project-id.yml new file mode 100644 index 00000000000..8705ed28400 --- /dev/null +++ b/changelogs/unreleased/display-project-id.yml @@ -0,0 +1,4 @@ +--- +title: Display project ID in project settings +merge_request: 8572 +author: winniehell |