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
211fe028
Commit
211fe028
authored
Aug 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak MR widget text some more.
parent
b2334da4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
app/views/projects/merge_requests/widget/_closed.html.haml
app/views/projects/merge_requests/widget/_closed.html.haml
+3
-1
app/views/projects/merge_requests/widget/open/_nothing.html.haml
...ws/projects/merge_requests/widget/open/_nothing.html.haml
+1
-1
app/views/projects/merge_requests/widget/open/_reload.html.haml
...ews/projects/merge_requests/widget/open/_reload.html.haml
+1
-1
No files found.
app/views/projects/merge_requests/widget/_closed.html.haml
View file @
211fe028
...
@@ -7,4 +7,6 @@
...
@@ -7,4 +7,6 @@
by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
true
)
}
by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
true
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
%p
%p
The changes were not merged into the target branch.
=
succeed
'.'
do
The changes were not merged into
%span
.label-branch
=
@merge_request
.
target_branch
app/views/projects/merge_requests/widget/open/_nothing.html.haml
View file @
211fe028
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
=
icon
(
"exclamation-triangle"
)
=
icon
(
"exclamation-triangle"
)
Nothing to merge from
Nothing to merge from
%span
.label-branch
=
source_branch_with_namespace
(
@merge_request
)
%span
.label-branch
=
source_branch_with_namespace
(
@merge_request
)
to
in
to
%span
.label-branch
=
@merge_request
.
target_branch
%span
.label-branch
=
@merge_request
.
target_branch
%p
%p
Please push new commits to the source branch or use a different target branch.
Please push new commits to the source branch or use a different target branch.
app/views/projects/merge_requests/widget/open/_reload.html.haml
View file @
211fe028
%h4
%h4
=
icon
(
"exclamation-triangle"
)
=
icon
(
"exclamation-triangle"
)
This merge request
could not
be merged automatically
This merge request
failed to
be merged automatically
%p
%p
Please reload the page to find out the reason.
Please reload the page to find out the reason.
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