Add warning if user own projet but not in team. Also show loading when merge MR
This commit is contained in:
parent
d1e63c7df2
commit
ee43e9248c
4 changed files with 10 additions and 1 deletions
|
@ -51,6 +51,10 @@ class MergeRequest
|
|||
this.$('.nav-tabs').on 'click', 'li', (event) =>
|
||||
this.activateTab($(event.currentTarget).data('action'))
|
||||
|
||||
this.$('.accept_merge_request').on 'click', ->
|
||||
$('.automerge_widget.can_be_merged').hide()
|
||||
$('.merge-in-progress').show()
|
||||
|
||||
activateTab: (action) ->
|
||||
this.$('.nav-tabs li').removeClass 'active'
|
||||
this.$('.tab-content').hide()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue