Commit 10dccdc4 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'issue-edit-inline' into issue-edit-inline-project-move-warning

[ci skip]
parents 6becf288 0defc4f7
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
class="btn btn-save pull-left" class="btn btn-save pull-left"
:class="{ disabled: formState.updateLoading || !isSubmitEnabled }" :class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
type="submit" type="submit"
:disabled="formState.updateLoading || !isSubmitEnabled" :disabled="updateLoading || !isSubmitEnabled"
@click.prevent="updateIssuable"> @click.prevent="updateIssuable">
Save changes Save changes
<i <i
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
aria-label="Description" aria-label="Description"
v-model="formState.description" v-model="formState.description"
ref="textarea" ref="textarea"
slot="textarea"> slot="textarea"
placeholder="Write a comment or drag your files here...">
</textarea> </textarea>
</markdown-field> </markdown-field>
</div> </div>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
/* /*
GLForm class handles all the toolbar buttons GLForm class handles all the toolbar buttons
*/ */
return new gl.GLForm($(this.$refs['gl-form'])); return new gl.GLForm($(this.$refs['gl-form']), true);
}, },
}; };
</script> </script>
......
...@@ -210,7 +210,7 @@ module IssuablesHelper ...@@ -210,7 +210,7 @@ module IssuablesHelper
markdownPreviewUrl: preview_markdown_path(@project), markdownPreviewUrl: preview_markdown_path(@project),
markdownDocs: help_page_path('user/markdown'), markdownDocs: help_page_path('user/markdown'),
projectsAutocompleteUrl: autocomplete_projects_path(project_id: @project.id), projectsAutocompleteUrl: autocomplete_projects_path(project_id: @project.id),
templates: issuable_templates(issuable), issuableTemplates: issuable_templates(issuable),
projectPath: ref_project.path, projectPath: ref_project.path,
projectNamespace: ref_project.namespace.full_path, projectNamespace: ref_project.namespace.full_path,
initialTitleHtml: markdown_field(issuable, :title), initialTitleHtml: markdown_field(issuable, :title),
......
...@@ -204,7 +204,7 @@ describe Projects::IssuesController do ...@@ -204,7 +204,7 @@ describe Projects::IssuesController do
body = JSON.parse(response.body) body = JSON.parse(response.body)
expect(body['assignees'].first.keys) expect(body['assignees'].first.keys)
.to match_array(%w(id name username avatar_url)) .to match_array(%w(id name username avatar_url state web_url))
end end
end end
......
...@@ -38,9 +38,11 @@ feature 'issue move to another project' do ...@@ -38,9 +38,11 @@ feature 'issue move to another project' do
end end
scenario 'moving issue to another project', js: true do scenario 'moving issue to another project', js: true do
find('#move_to_project_id', visible: false).set(new_project.id) find('#issuable-move', visible: false).set(new_project.id)
click_button('Save changes') click_button('Save changes')
wait_for_requests
expect(current_url).to include project_path(new_project) expect(current_url).to include project_path(new_project)
expect(page).to have_content("Text with #{cross_reference}#{mr.to_reference}") expect(page).to have_content("Text with #{cross_reference}#{mr.to_reference}")
...@@ -51,7 +53,7 @@ feature 'issue move to another project' do ...@@ -51,7 +53,7 @@ feature 'issue move to another project' do
scenario 'searching project dropdown', js: true do scenario 'searching project dropdown', js: true do
new_project_search.team << [user, :reporter] new_project_search.team << [user, :reporter]
page.within '.js-move-dropdown' do page.within '.detail-page-description' do
first('.select2-choice').click first('.select2-choice').click
end end
...@@ -69,7 +71,7 @@ feature 'issue move to another project' do ...@@ -69,7 +71,7 @@ feature 'issue move to another project' do
background { another_project.team << [user, :guest] } background { another_project.team << [user, :guest] }
scenario 'browsing projects in projects select' do scenario 'browsing projects in projects select' do
click_link 'Select project' click_link 'Move to a different project'
page.within '.select2-results' do page.within '.select2-results' do
expect(page).to have_content 'No project' expect(page).to have_content 'No project'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment