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
1c6aa5c7
Commit
1c6aa5c7
authored
May 19, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MRWidget: Fix approvals related specs.
parent
dc9474fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js
...e_request_widget/ee/components/states/mr_widget_rebase.js
+7
-2
spec/serializers/merge_request_entity_spec.rb
spec/serializers/merge_request_entity_spec.rb
+0
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js
View file @
1c6aa5c7
...
...
@@ -19,6 +19,11 @@ export default {
isMakingRequest
:
false
,
};
},
computed
:
{
isApprovalsLeft
()
{
return
this
.
mr
.
approvals
&&
this
.
mr
.
approvalsLeft
;
},
},
methods
:
{
rebase
()
{
this
.
isMakingRequest
=
true
;
...
...
@@ -82,7 +87,7 @@ export default {
<div class="accept-merge-holder clearfix js-toggle-container accept-action">
<button
class="btn btn-small btn-reopen btn-success"
:disabled="
mr.a
pprovalsLeft || isMakingRequest"
:disabled="
isA
pprovalsLeft || isMakingRequest"
@click="rebase">
<i
v-if="isMakingRequest"
...
...
@@ -98,7 +103,7 @@ export default {
</div>
<div class="mr-info-list">
<div class="legend"></div>
<p v-if="
mr.a
pprovalsLeft">
<p v-if="
isA
pprovalsLeft">
Rebasing is disabled until merge request has been approved.
</p>
</div>
...
...
spec/serializers/merge_request_entity_spec.rb
View file @
1c6aa5c7
...
...
@@ -51,7 +51,6 @@ describe MergeRequestEntity do
## EE
:can_push_to_source_branch
,
:approvals_before_merge
,
:squash
,
:rebase_commit_sha
,
:rebase_in_progress
,
:approved
,
:should_be_rebased
,
:rebase_path
,
:approvals_path
,
:ff_only_enabled
)
end
...
...
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