Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
71130ba7
Commit
71130ba7
authored
Aug 15, 2017
by
Clement Ho
Committed by
Phil Hughes
Aug 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix edit merge request button inconsistent letter casing
parent
ef0e3c8e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
13 deletions
+18
-13
app/views/projects/issues/_nav_btns.html.haml
app/views/projects/issues/_nav_btns.html.haml
+1
-1
app/views/projects/merge_requests/_nav_btns.html.haml
app/views/projects/merge_requests/_nav_btns.html.haml
+1
-1
changelogs/unreleased/fix-edit-merge-request-button-case.yml
changelogs/unreleased/fix-edit-merge-request-button-case.yml
+5
-0
spec/features/issues/bulk_assignment_labels_spec.rb
spec/features/issues/bulk_assignment_labels_spec.rb
+2
-2
spec/features/issues/update_issues_spec.rb
spec/features/issues/update_issues_spec.rb
+6
-6
spec/features/merge_requests/update_merge_requests_spec.rb
spec/features/merge_requests/update_merge_requests_spec.rb
+3
-3
No files found.
app/views/projects/issues/_nav_btns.html.haml
View file @
71130ba7
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn btn-default append-right-10 has-tooltip'
,
title:
'Subscribe'
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn btn-default append-right-10 has-tooltip'
,
title:
'Subscribe'
do
=
icon
(
'rss'
)
=
icon
(
'rss'
)
-
if
@can_bulk_update
-
if
@can_bulk_update
=
button_tag
"Edit
I
ssues"
,
class:
"btn btn-default append-right-10 js-bulk-update-toggle"
=
button_tag
"Edit
i
ssues"
,
class:
"btn btn-default append-right-10 js-bulk-update-toggle"
=
link_to
"New issue"
,
new_project_issue_path
(
@project
,
=
link_to
"New issue"
,
new_project_issue_path
(
@project
,
issue:
{
assignee_id:
issues_finder
.
assignee
.
try
(
:id
),
issue:
{
assignee_id:
issues_finder
.
assignee
.
try
(
:id
),
milestone_id:
issues_finder
.
milestones
.
first
.
try
(
:id
)
}),
milestone_id:
issues_finder
.
milestones
.
first
.
try
(
:id
)
}),
...
...
app/views/projects/merge_requests/_nav_btns.html.haml
View file @
71130ba7
-
if
@can_bulk_update
-
if
@can_bulk_update
=
button_tag
"Edit
Merge R
equests"
,
class:
"btn js-bulk-update-toggle"
=
button_tag
"Edit
merge r
equests"
,
class:
"btn js-bulk-update-toggle"
-
if
merge_project
-
if
merge_project
=
link_to
new_merge_request_path
,
class:
"btn btn-new"
,
title:
"New merge request"
do
=
link_to
new_merge_request_path
,
class:
"btn btn-new"
,
title:
"New merge request"
do
New merge request
New merge request
changelogs/unreleased/fix-edit-merge-request-button-case.yml
0 → 100644
View file @
71130ba7
---
title
:
Fix edit merge request and issues button inconsistent letter casing
merge_request
:
author
:
type
:
fixed
spec/features/issues/bulk_assignment_labels_spec.rb
View file @
71130ba7
...
@@ -353,7 +353,7 @@ feature 'Issues > Labels bulk assignment' do
...
@@ -353,7 +353,7 @@ feature 'Issues > Labels bulk assignment' do
context
'cannot bulk assign labels'
do
context
'cannot bulk assign labels'
do
it
do
it
do
expect
(
page
).
not_to
have_button
'Edit
I
ssues'
expect
(
page
).
not_to
have_button
'Edit
i
ssues'
expect
(
page
).
not_to
have_css
'.check-all-issues'
expect
(
page
).
not_to
have_css
'.check-all-issues'
expect
(
page
).
not_to
have_css
'.issue-check'
expect
(
page
).
not_to
have_css
'.issue-check'
end
end
...
@@ -411,7 +411,7 @@ feature 'Issues > Labels bulk assignment' do
...
@@ -411,7 +411,7 @@ feature 'Issues > Labels bulk assignment' do
def
enable_bulk_update
def
enable_bulk_update
visit
project_issues_path
(
project
)
visit
project_issues_path
(
project
)
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
end
end
def
disable_bulk_update
def
disable_bulk_update
...
...
spec/features/issues/update_issues_spec.rb
View file @
71130ba7
...
@@ -14,7 +14,7 @@ feature 'Multiple issue updating from issues#index', :js do
...
@@ -14,7 +14,7 @@ feature 'Multiple issue updating from issues#index', :js do
it
'sets to closed'
do
it
'sets to closed'
do
visit
project_issues_path
(
project
)
visit
project_issues_path
(
project
)
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.js-issue-status'
).
click
find
(
'.js-issue-status'
).
click
...
@@ -27,7 +27,7 @@ feature 'Multiple issue updating from issues#index', :js do
...
@@ -27,7 +27,7 @@ feature 'Multiple issue updating from issues#index', :js do
create_closed
create_closed
visit
project_issues_path
(
project
,
state:
'closed'
)
visit
project_issues_path
(
project
,
state:
'closed'
)
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.js-issue-status'
).
click
find
(
'.js-issue-status'
).
click
...
@@ -41,7 +41,7 @@ feature 'Multiple issue updating from issues#index', :js do
...
@@ -41,7 +41,7 @@ feature 'Multiple issue updating from issues#index', :js do
it
'updates to current user'
do
it
'updates to current user'
do
visit
project_issues_path
(
project
)
visit
project_issues_path
(
project
)
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
click_update_assignee_button
click_update_assignee_button
...
@@ -57,7 +57,7 @@ feature 'Multiple issue updating from issues#index', :js do
...
@@ -57,7 +57,7 @@ feature 'Multiple issue updating from issues#index', :js do
create_assigned
create_assigned
visit
project_issues_path
(
project
)
visit
project_issues_path
(
project
)
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
click_update_assignee_button
click_update_assignee_button
...
@@ -73,7 +73,7 @@ feature 'Multiple issue updating from issues#index', :js do
...
@@ -73,7 +73,7 @@ feature 'Multiple issue updating from issues#index', :js do
it
'updates milestone'
do
it
'updates milestone'
do
visit
project_issues_path
(
project
)
visit
project_issues_path
(
project
)
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
...
@@ -89,7 +89,7 @@ feature 'Multiple issue updating from issues#index', :js do
...
@@ -89,7 +89,7 @@ feature 'Multiple issue updating from issues#index', :js do
expect
(
first
(
'.issue'
)).
to
have_content
milestone
.
title
expect
(
first
(
'.issue'
)).
to
have_content
milestone
.
title
click_button
'Edit
I
ssues'
click_button
'Edit
i
ssues'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
...
...
spec/features/merge_requests/update_merge_requests_spec.rb
View file @
71130ba7
...
@@ -98,7 +98,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
...
@@ -98,7 +98,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
end
end
def
change_status
(
text
)
def
change_status
(
text
)
click_button
'Edit
Merge R
equests'
click_button
'Edit
merge r
equests'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.js-issue-status'
).
click
find
(
'.js-issue-status'
).
click
find
(
'.dropdown-menu-status a'
,
text:
text
).
click
find
(
'.dropdown-menu-status a'
,
text:
text
).
click
...
@@ -106,7 +106,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
...
@@ -106,7 +106,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
end
end
def
change_assignee
(
text
)
def
change_assignee
(
text
)
click_button
'Edit
Merge R
equests'
click_button
'Edit
merge r
equests'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.js-update-assignee'
).
click
find
(
'.js-update-assignee'
).
click
wait_for_requests
wait_for_requests
...
@@ -119,7 +119,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
...
@@ -119,7 +119,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
end
end
def
change_milestone
(
text
)
def
change_milestone
(
text
)
click_button
'Edit
Merge R
equests'
click_button
'Edit
merge r
equests'
find
(
'#check-all-issues'
).
click
find
(
'#check-all-issues'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
find
(
'.dropdown-menu-milestone a'
,
text:
text
).
click
find
(
'.dropdown-menu-milestone a'
,
text:
text
).
click
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment