Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Login methods
Sign in
Toggle navigation
Menu
Open sidebar
projects.thm.de
GitLab
Commits
7327fb4a
Unverified
Commit
7327fb4a
authored
Dec 19, 2018
by
Grzegorz Bizon
Committed by
Yorick Peterse
Jan 31, 2019
Browse files
Present all pipeline triggers using trigger presenter
parent
084b7edb
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/settings/ci_cd_controller.rb
View file @
7327fb4a
...
...
@@ -99,7 +99,9 @@ def define_ci_variables
def
define_triggers_variables
@triggers
=
@project
.
triggers
.
present
(
current_user:
current_user
)
@trigger
=
::
Ci
::
Trigger
.
new
.
present
(
current_user:
current_user
)
end
def
define_badges_variables
...
...
app/models/ci/trigger.rb
View file @
7327fb4a
...
...
@@ -30,7 +30,7 @@ def last_used
end
def
short_token
token
[
0
...
4
]
token
[
0
...
4
]
if
token
.
present?
end
def
legacy?
...
...
lib/api/triggers.rb
View file @
7327fb4a
...
...
@@ -85,7 +85,7 @@ class Triggers < Grape::API
declared_params
(
include_missing:
false
).
merge
(
owner:
current_user
))
if
trigger
.
valid?
present
trigger
,
with:
Entities
::
Trigger
present
trigger
,
with:
Entities
::
Trigger
,
current_user:
current_user
else
render_validation_error!
(
trigger
)
end
...
...
@@ -106,7 +106,7 @@ class Triggers < Grape::API
break
not_found!
(
'Trigger'
)
unless
trigger
if
trigger
.
update
(
declared_params
(
include_missing:
false
))
present
trigger
,
with:
Entities
::
Trigger
present
trigger
,
with:
Entities
::
Trigger
,
current_user:
current_user
else
render_validation_error!
(
trigger
)
end
...
...
@@ -127,7 +127,7 @@ class Triggers < Grape::API
if
trigger
.
update
(
owner:
current_user
)
status
:ok
present
trigger
,
with:
Entities
::
Trigger
present
trigger
,
with:
Entities
::
Trigger
,
current_user:
current_user
else
render_validation_error!
(
trigger
)
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