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
Léo-Paul Géneau
gitlab-ce
Commits
8eaead6a
Commit
8eaead6a
authored
Aug 19, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Text message for mergeing MR
parent
7530fa9d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletion
+11
-1
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+1
-0
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+5
-0
app/views/merge_requests/_show.html.haml
app/views/merge_requests/_show.html.haml
+2
-1
app/views/merge_requests/show/_mr_accept.html.haml
app/views/merge_requests/show/_mr_accept.html.haml
+3
-0
No files found.
app/assets/javascripts/merge_requests.js
View file @
8eaead6a
...
@@ -112,6 +112,7 @@ var MergeRequest = {
...
@@ -112,6 +112,7 @@ var MergeRequest = {
already_cannot_be_merged
:
already_cannot_be_merged
:
function
(){
function
(){
$
(
"
.automerge_widget
"
).
hide
();
$
(
"
.automerge_widget
"
).
hide
();
$
(
"
.merge_in_progress
"
).
hide
();
$
(
"
.automerge_widget.already_cannot_be_merged
"
).
show
();
$
(
"
.automerge_widget.already_cannot_be_merged
"
).
show
();
}
}
}
}
app/assets/stylesheets/sections/merge_requests.scss
View file @
8eaead6a
...
@@ -94,3 +94,8 @@ li.merge_request {
...
@@ -94,3 +94,8 @@ li.merge_request {
padding-bottom
:
2px
;
padding-bottom
:
2px
;
}
}
}
}
.merge_in_progress
{
@extend
.padded
;
@extend
.append-bottom-10
;
}
app/views/merge_requests/_show.html.haml
View file @
8eaead6a
...
@@ -33,7 +33,8 @@
...
@@ -33,7 +33,8 @@
});
});
$
(
"
.edit_merge_request
"
).
live
(
"
ajax:beforeSend
"
,
function
()
{
$
(
"
.edit_merge_request
"
).
live
(
"
ajax:beforeSend
"
,
function
()
{
$
(
this
).
replaceWith
(
'
#{
image_tag
"ajax_loader.gif"
}
'
);
$
(
'
.can_be_merged
'
).
hide
();
$
(
'
.merge_in_progress
'
).
show
();
})
})
})
})
app/views/merge_requests/show/_mr_accept.html.haml
View file @
8eaead6a
...
@@ -40,3 +40,6 @@
...
@@ -40,3 +40,6 @@
.alert.alert-info
.alert.alert-info
%strong
This merge request already can not be merged. Try to reload page.
%strong
This merge request already can not be merged. Try to reload page.
.merge_in_progress.hide
%span
.cgray
Merge is in progress. Please wait. Page will be automatically reloaded.
=
image_tag
"ajax_loader.gif"
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