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
Jérome Perrin
gitlab-ce
Commits
e6f34237
Commit
e6f34237
authored
Jan 12, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverting MR ajax changes, which will be in a different MR
parent
aaf184bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
16 deletions
+2
-16
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+2
-3
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+0
-13
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
e6f34237
...
...
@@ -28,9 +28,8 @@ class @MergeRequestWidget
getMergeStatus
:
->
$
.
get
@
opts
.
url_to_automerge_check
,
(
data
)
->
console
.
log
(
"data"
,
data
);
# $('div.mr-state-widget.mr-state-widget-opened').replaceWith(data)
$
(
'.mr-state-widget'
).
replaceWith
(
data
)
getCiStatus
:
->
if
@
opts
.
ci_enable
$
.
get
@
opts
.
url_to_ci_check
,
(
data
)
=>
...
...
app/helpers/merge_requests_helper.rb
View file @
e6f34237
...
...
@@ -19,19 +19,6 @@ module MergeRequestsHelper
}
end
def
merge_request_button_visibility
(
mr
,
closed
)
return
'hidden'
if
mr
.
closed?
==
closed
end
def
merge_request_widget_visibility
(
mr
,
*
states
)
states
.
each
do
|
state
|
if
mr
.
state
==
state
return
end
end
return
'hidden'
end
def
mr_css_classes
(
mr
)
classes
=
"merge-request"
classes
<<
" closed"
if
mr
.
closed?
...
...
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