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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0b432493
Commit
0b432493
authored
Aug 15, 2013
by
Henry Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A couple of small wording improvements for the merge request approval page
parent
f3ee1b42
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
0b432493
-
unless
@allowed_to_merge
-
unless
@allowed_to_merge
.alert
.alert
%strong
You don't have
enough permissions
to merge this MR
%strong
You don't have
permission
to merge this MR
-
if
@show_merge_controls
-
if
@show_merge_controls
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
.automerge_widget.no_satellite
{
style:
"display:none"
}
.automerge_widget.no_satellite
{
style:
"display:none"
}
.alert.alert-error
.alert.alert-error
%span
%span
%strong
This repository does not have satellite. Ask administrator to fix this issue
%strong
This repository does not have satellite. Ask a
n a
dministrator to fix this issue
.automerge_widget.cannot_be_merged
{
style:
"display:none"
}
.automerge_widget.cannot_be_merged
{
style:
"display:none"
}
.alert.alert-disabled
.alert.alert-disabled
...
...
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