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
08519db4
Commit
08519db4
authored
Jan 02, 2020
by
Etienne Baqué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed ReviewAppSetup file
Got rid off unnecessary refactoring.
parent
88c21102
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
46 deletions
+39
-46
app/controllers/concerns/review_app_setup.rb
app/controllers/concerns/review_app_setup.rb
+0
-40
app/presenters/project_presenter.rb
app/presenters/project_presenter.rb
+36
-2
app/serializers/review_app_setup_entity.rb
app/serializers/review_app_setup_entity.rb
+3
-4
No files found.
app/controllers/concerns/review_app_setup.rb
deleted
100644 → 0
View file @
88c21102
# frozen_string_literal: true
module
ReviewAppSetup
include
Gitlab
::
Utils
::
StrongMemoize
include
ChecksCollaboration
def
can_setup_review_app?
strong_memoize
(
:can_setup_review_app?
)
do
cicd_missing?
||
(
can_cluster_be_created?
&&
cluster_missing?
)
end
end
def
cicd_missing?
current_user
&&
can_current_user_push_code?
&&
project
.
repository
.
gitlab_ci_yml
.
blank?
&&
!
project
.
auto_devops_enabled?
end
def
can_cluster_be_created?
current_user
&&
can?
(
current_user
,
:create_cluster
,
project
)
end
def
can_current_user_push_code?
strong_memoize
(
:can_current_user_push_code
)
do
if
project
.
empty_repo?
can?
(
current_user
,
:push_code
,
project
)
else
can_current_user_push_to_branch?
(
project
.
default_branch
)
end
end
end
def
cluster_missing?
strong_memoize
(
:cluster_missing?
)
do
project
.
clusters
.
blank?
end
end
def
can_current_user_push_to_branch?
(
branch
)
user_access
(
project
).
can_push_to_branch?
(
branch
)
end
end
app/presenters/project_presenter.rb
View file @
08519db4
...
...
@@ -8,7 +8,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
include
TreeHelper
include
IconsHelper
include
ChecksCollaboration
include
ReviewAppSetup
include
Gitlab
::
Utils
::
StrongMemoize
presents
:project
...
...
@@ -124,6 +124,20 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
license
&
.
nickname
||
license
&
.
name
||
'LICENSE'
end
def
can_current_user_push_code?
strong_memoize
(
:can_current_user_push_code
)
do
if
empty_repo?
can?
(
current_user
,
:push_code
,
project
)
else
can_current_user_push_to_branch?
(
default_branch
)
end
end
end
def
can_current_user_push_to_branch?
(
branch
)
user_access
(
project
).
can_push_to_branch?
(
branch
)
end
def
can_current_user_push_to_default_branch?
can_current_user_push_to_branch?
(
default_branch
)
end
...
...
@@ -263,7 +277,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
def
kubernetes_cluster_anchor_data
if
can_cluster_be_created?
if
clusters
.
empty?
if
clusters
_
empty?
AnchorData
.
new
(
false
,
statistic_icon
+
_
(
'Add Kubernetes cluster'
),
new_project_cluster_path
(
project
))
...
...
@@ -311,6 +325,26 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
count_of_extra_topics_not_shown
>
0
end
def
can_setup_review_app?
strong_memoize
(
:can_setup_review_app
)
do
cicd_missing?
||
(
can_cluster_be_created?
&&
clusters_empty?
)
end
end
def
can_cluster_be_created?
current_user
&&
can?
(
current_user
,
:create_cluster
,
project
)
end
def
cicd_missing?
current_user
&&
can_current_user_push_code?
&&
repository
.
gitlab_ci_yml
.
blank?
&&
!
auto_devops_enabled?
end
def
clusters_empty?
strong_memoize
(
:cluster_missing
)
do
project
.
clusters
.
empty?
end
end
private
def
filename_path
(
filename
)
...
...
app/serializers/review_app_setup_entity.rb
View file @
08519db4
...
...
@@ -2,15 +2,14 @@
class
ReviewAppSetupEntity
<
Grape
::
Entity
include
RequestAwareEntity
include
ReviewAppSetup
expose
:can_setup_review_app?
expose
:cluster
_missing?
,
if:
->
(
_
,
_
)
{
can_setup_review_app?
}
do
|
project
|
cluster_missing
?
expose
:cluster
s_empty?
,
if:
->
(
_
,
_
)
{
project
.
can_setup_review_app?
}
do
|
project
|
project
.
clusters_empty
?
end
expose
:review_snippet
,
if:
->
(
_
,
_
)
{
can_setup_review_app?
}
do
|
_
|
expose
:review_snippet
,
if:
->
(
_
,
_
)
{
project
.
can_setup_review_app?
}
do
|
_
|
YAML
.
safe_load
(
File
.
read
(
Rails
.
root
.
join
(
'lib'
,
'gitlab'
,
'ci'
,
'snippets'
,
'review_app_default.yml'
))).
inspect
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