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
dab9835a
Commit
dab9835a
authored
Jul 30, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use label-branch css for MR branches info
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f0c26bcb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
16 deletions
+10
-16
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+3
-5
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+7
-11
No files found.
app/views/projects/merge_requests/_new_submit.html.haml
View file @
dab9835a
...
...
@@ -2,11 +2,9 @@
New merge request
%p
.slead
From
%strong
.monospace
#{
@merge_request
.
source_project_namespace
}
:
#{
@merge_request
.
source_branch
}
into
%strong
.monospace
#{
@merge_request
.
target_project_namespace
}
:
#{
@merge_request
.
target_branch
}
%strong
.label-branch
#{
@merge_request
.
source_project_namespace
}
:
#{
@merge_request
.
source_branch
}
%span
into
%strong
.label-branch
#{
@merge_request
.
target_project_namespace
}
:
#{
@merge_request
.
target_branch
}
%span
.pull-right
=
link_to
'Change branches'
,
new_project_merge_request_path
(
@project
)
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
dab9835a
...
...
@@ -28,15 +28,11 @@
=
link_to
project_merge_requests_path
(
@project
)
do
←
To merge requests
%span
.prepend-left-20.monospace
-
if
@merge_request
.
for_fork?
%span
%strong
#{
truncate
(
@merge_request
.
source_project_path
,
length:
25
)
}
:
#{
@merge_request
.
source_branch
}
→
%span
=
@merge_request
.
target_branch
%span
.prepend-left-20
%span
From
-
if
@merge_request
.
for_fork?
%strong
.label-branch
#{
@merge_request
.
source_project_namespace
}
:
#{
@merge_request
.
source_branch
}
-
else
%s
pan
=
@merge_request
.
source_branch
→
%span
=
@merge_request
.
target_branch
%s
trong
.label-branch
#{
@merge_request
.
source_branch
}
%span
into
%strong
.label-branch
#{
@merge_request
.
target_branch
}
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