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
Boxiang Sun
gitlab-ce
Commits
09e58d3f
Commit
09e58d3f
authored
Feb 13, 2019
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE Port of Multiple merge request approval rules
EE MR:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
parent
da1aaaf2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
1 deletion
+11
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+2
-1
spec/features/merge_request/user_creates_merge_request_spec.rb
...features/merge_request/user_creates_merge_request_spec.rb
+2
-0
spec/features/projects/settings/forked_project_settings_spec.rb
...eatures/projects/settings/forked_project_settings_spec.rb
+1
-0
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+4
-0
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+2
-0
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
09e58d3f
...
@@ -166,7 +166,8 @@
...
@@ -166,7 +166,8 @@
@include
btn-outline
(
$white-light
,
$green-600
,
$green-500
,
$green-500
,
$white-light
,
$green-600
,
$green-600
,
$green-700
);
@include
btn-outline
(
$white-light
,
$green-600
,
$green-500
,
$green-500
,
$white-light
,
$green-600
,
$green-600
,
$green-700
);
}
}
&
.btn-remove
{
&
.btn-remove
,
&
.btn-danger
{
@include
btn-outline
(
$white-light
,
$red-500
,
$red-500
,
$red-500
,
$white-light
,
$red-600
,
$red-600
,
$red-700
);
@include
btn-outline
(
$white-light
,
$red-500
,
$red-500
,
$red-500
,
$white-light
,
$red-600
,
$red-600
,
$red-700
);
}
}
...
...
spec/features/merge_request/user_creates_merge_request_spec.rb
View file @
09e58d3f
...
@@ -8,6 +8,8 @@ describe "User creates a merge request", :js do
...
@@ -8,6 +8,8 @@ describe "User creates a merge request", :js do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
stub_feature_flags
(
approval_rules:
false
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/settings/forked_project_settings_spec.rb
View file @
09e58d3f
...
@@ -7,6 +7,7 @@ describe 'Projects > Settings > For a forked project', :js do
...
@@ -7,6 +7,7 @@ describe 'Projects > Settings > For a forked project', :js do
let
(
:forked_project
)
{
fork_project
(
original_project
,
user
)
}
let
(
:forked_project
)
{
fork_project
(
original_project
,
user
)
}
before
do
before
do
stub_feature_flags
(
approval_rules:
false
)
original_project
.
add_maintainer
(
user
)
original_project
.
add_maintainer
(
user
)
forked_project
.
add_maintainer
(
user
)
forked_project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
...
...
spec/features/projects_spec.rb
View file @
09e58d3f
...
@@ -4,6 +4,10 @@ describe 'Project' do
...
@@ -4,6 +4,10 @@ describe 'Project' do
include
ProjectForksHelper
include
ProjectForksHelper
include
MobileHelpers
include
MobileHelpers
before
do
stub_feature_flags
(
approval_rules:
false
)
end
describe
'creating from template'
do
describe
'creating from template'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:template
)
{
Gitlab
::
ProjectTemplate
.
find
(
:rails
)
}
let
(
:template
)
{
Gitlab
::
ProjectTemplate
.
find
(
:rails
)
}
...
...
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
View file @
09e58d3f
...
@@ -21,6 +21,7 @@ describe('mrWidgetOptions', () => {
...
@@ -21,6 +21,7 @@ describe('mrWidgetOptions', () => {
const
COLLABORATION_MESSAGE
=
'
Allows commits from members who can merge to the target branch
'
;
const
COLLABORATION_MESSAGE
=
'
Allows commits from members who can merge to the target branch
'
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
gon
.
features
=
{
approvalRules
:
false
};
// Prevent component mounting
// Prevent component mounting
delete
mrWidgetOptions
.
el
;
delete
mrWidgetOptions
.
el
;
...
@@ -31,6 +32,7 @@ describe('mrWidgetOptions', () => {
...
@@ -31,6 +32,7 @@ describe('mrWidgetOptions', () => {
});
});
afterEach
(()
=>
{
afterEach
(()
=>
{
gon
.
features
=
null
;
vm
.
$destroy
();
vm
.
$destroy
();
});
});
...
...
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