Commit 48076c98 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'updated-triggers-ui' into 'master'

Updated triggers UI

![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png)

![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png)

Closes #14090

See merge request !3946
parents 973b948b 1cf8723d
...@@ -153,7 +153,7 @@ $nav-link-padding: 13px $gl-padding; ...@@ -153,7 +153,7 @@ $nav-link-padding: 13px $gl-padding;
//== Code //== Code
// //
//## //##
$pre-bg: #f8fafc !default; $pre-bg: #f4f7fd !default;
$pre-color: $gl-gray !default; $pre-color: $gl-gray !default;
$pre-border-color: #e7e9ed; $pre-border-color: #e7e9ed;
......
%tr %tr
%td %td
.clearfix %span.monospace= trigger.token
%span.monospace= trigger.token
%td %td
- if trigger.last_trigger_request - if trigger.last_trigger_request
...@@ -9,6 +8,5 @@ ...@@ -9,6 +8,5 @@
- else - else
Never Never
%td %td.text-right
.pull-right = link_to 'Revoke', namespace_project_trigger_path(@project.namespace, @project, trigger), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-warning btn-sm"
= link_to 'Revoke', namespace_project_trigger_path(@project.namespace, @project, trigger), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-danger btn-sm btn-grouped"
- page_title "Triggers" - page_title "Triggers"
%h3.page-title
Triggers
%p.light .row.prepend-top-default.append-bottom-default
Triggers can be used to force a rebuild of a specific branch or tag with an API call. .col-lg-3
%h4.prepend-top-0
= page_title
%p
Triggers can be used to force a rebuild of a specific branch or tag with an API call.
.col-lg-9
%h5.prepend-top-0
Your triggers
- if @triggers.any?
.table-responsive
%table.table
%thead
%th Token
%th Last used
%th
= render partial: 'trigger', collection: @triggers, as: :trigger
- else
%p.profile-settings-message.text-center.append-bottom-default
There are no triggers to use, add one by the button below.
%hr.clearfix = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f|
= f.submit "Add Trigger", class: 'btn btn-success'
-if @triggers.any? %h5.prepend-top-default
.table-holder Use CURL
%table.table
%thead
%th Token
%th Last used
%th
= render partial: 'trigger', collection: @triggers, as: :trigger
- else
%h4 No triggers
= form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create'), html: { class: 'form-horizontal' } do |f| %p.light
.clearfix Copy the token above and set your branch or tag name. This is the reference that will be rebuild.
= f.submit "Add Trigger", class: 'btn btn-success pull-right'
%hr.clearfix
-if @triggers.any? %pre
%h3 :plain
Use CURL curl -X POST \
-F token=TOKEN \
-F ref=REF_NAME \
#{builds_trigger_url(@project.id)}
%h5.prepend-top-default
Use .gitlab-ci.yml
%p.light %p.light
Copy the token above and set your branch or tag name. This is the reference that will be rebuild. Copy the snippet to
%i .gitlab-ci.yml
of dependent project.
At the end of your build it will trigger this project to rebuilt.
%pre
:plain
trigger:
type: deploy
script:
- "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}"
%h5.prepend-top-default
Pass build variables
%pre %p.light
:plain Add
curl -X POST \ %strong variables[VARIABLE]=VALUE
-F token=TOKEN \ to API request.
-F ref=REF_NAME \ The value of variable could then be used to distinguish triggered build from normal one.
#{builds_trigger_url(@project.id)}
%h3
Use .gitlab-ci.yml
%p.light %pre.append-bottom-0
Copy the snippet to :plain
%i .gitlab-ci.yml curl -X POST \
of dependent project. -F token=TOKEN \
At the end of your build it will trigger this project to rebuilt. -F "ref=REF_NAME" \
-F "variables[RUN_NIGHTLY_BUILD]=true" \
%pre #{builds_trigger_url(@project.id)}
:plain
trigger:
type: deploy
script:
- "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}"
%h3
Pass build variables
%p.light
Add
%strong variables[VARIABLE]=VALUE
to API request.
The value of variable could then be used to distinguish triggered build from normal one.
%pre
:plain
curl -X POST \
-F token=TOKEN \
-F "ref=REF_NAME" \
-F "variables[RUN_NIGHTLY_BUILD]=true" \
#{builds_trigger_url(@project.id)}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment