diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-27 19:06:48 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-01-31 12:29:36 -0800 |
| commit | 152ff65eabe07c791e60c2e9cd3a6149a2679c3f (patch) | |
| tree | f8d8c2ed00b04a6d768ad0dcbff98653f1a86f07 | |
| parent | 6d986d14656d04ed1925fffb1029b46a6a3fbc4d (diff) | |
| download | gitlab-ce-152ff65eabe07c791e60c2e9cd3a6149a2679c3f.tar.gz | |
Merge branch '27259-label-for-references-the-wrong-associated-text-input' into 'master'
Fix project name label's for reference in project settings
Closes #27259
See merge request !8795
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27259-label-for-references-the-wrong-associated-text-input.yml | 4 | ||||
| -rw-r--r-- | spec/features/projects/project_settings_spec.rb | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 1d7fdf68cb3..b6f5aaa13e8 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -8,7 +8,7 @@ = 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 + = f.label :name, class: 'label-light', for: 'project_name_edit' do Project name = f.text_field :name, class: "form-control", id: "project_name_edit" .form-group diff --git a/changelogs/unreleased/27259-label-for-references-the-wrong-associated-text-input.yml b/changelogs/unreleased/27259-label-for-references-the-wrong-associated-text-input.yml new file mode 100644 index 00000000000..2591f161bc5 --- /dev/null +++ b/changelogs/unreleased/27259-label-for-references-the-wrong-associated-text-input.yml @@ -0,0 +1,4 @@ +--- +title: Fix project name label's for reference in project settings +merge_request: 8795 +author: diff --git a/spec/features/projects/project_settings_spec.rb b/spec/features/projects/project_settings_spec.rb index 55d5d082c6e..5d0314d5c09 100644 --- a/spec/features/projects/project_settings_spec.rb +++ b/spec/features/projects/project_settings_spec.rb @@ -37,7 +37,7 @@ describe 'Edit Project Settings', feature: true do it 'shows errors for invalid project path/name' do visit edit_namespace_project_path(project.namespace, project) - fill_in 'Project name', with: 'foo&bar' + fill_in 'project_name', with: 'foo&bar' fill_in 'Path', with: 'foo&bar' click_button 'Rename project' @@ -53,7 +53,7 @@ describe 'Edit Project Settings', feature: true do it 'shows error for invalid project name' do visit edit_namespace_project_path(project.namespace, project) - fill_in 'Project name', with: '🚀 foo bar ☁️' + fill_in 'project_name', with: '🚀 foo bar ☁️' click_button 'Rename project' |