summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch '46010-allow-managing-group-runners-via-api' into 'master'Kamil Trzciński2018-05-161-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-161-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-161-0/+2
|/ / / / / / /
* | | | | | | Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-151-13/+0
|\ \ \ \ \ \ \
| * | | | | | | Clean up `notes_controller`blackst0ne2018-05-141-13/+0
* | | | | | | | Enable update_(build|pipeline) for maintainersJan Provaznik2018-05-151-0/+4
| |/ / / / / / |/| | | | | |
* | | | | | | Fix cross-origin errors when attempting to download JavaScript attachmentsStan Hu2018-05-131-0/+4
|/ / / / / /
* | | | | | Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-111-2/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Allow a user to sign out when on the terms pageBob Van Landuyt2018-05-111-2/+7
* | | | | | Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-111-0/+4
|\ \ \ \ \ \
| * | | | | | Enforce terms acceptance before other requirementsBob Van Landuyt2018-05-111-0/+4
| |/ / / / /
* | | | | | Merge branch 'dz-add-2fa-filter' into 'master'Douwe Maan2018-05-111-1/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add 2FA filter to group members pageDmitriy Zaporozhets2018-05-101-1/+8
* | | | | | Align with EELin Jen-Shin2018-05-091-3/+3
|/ / / / /
* | | | | Merge branch 'fix-failed-jobs-tab' into 'master'Grzegorz Bizon2018-05-081-1/+1
|\ \ \ \ \
| * | | | | Respect permissions when showing Failed JobsKamil Trzciński2018-05-061-1/+1
* | | | | | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-071-8/+12
|\ \ \ \ \ \
| * | | | | | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-071-8/+12
* | | | | | | Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-071-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-031-1/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-073-10/+69
|\ \ \ \ \ \ \
| * | | | | | | Support anchors for Groups::RunnersControllerKamil Trzciński2018-05-071-5/+5
| * | | | | | | Add a comment about implementing proper policies for group runner permissionsDylan Griffith2018-05-071-0/+3
| * | | | | | | Rename set_runner -> runner in runner controllersDylan Griffith2018-05-072-4/+4
| * | | | | | | Share _form and show for project, instance and group runnersDylan Griffith2018-05-072-0/+2
| * | | | | | | Allow to pause,resume,show,edit,destroy group runners (#10244)Dylan Griffith2018-05-071-0/+54
| * | | | | | | Inline runner_path and runners_path helpersDylan Griffith2018-05-072-8/+8
* | | | | | | | Adds remote mirror table migrationTiago Botelho2018-05-072-3/+6
* | | | | | | | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-072-0/+70
| |_|/ / / / / |/| | | | | |
* | | | | | | Add signature verification badge to compare viewMarc2018-05-071-16/+49
* | | | | | | Merge branch '33697-pipelines-json-endpoint' into 'master'Kamil Trzciński2018-05-071-3/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into 33697-pipelines-json-endpointMatija Čupić2018-05-028-11/+23
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Fix syntax errorKamil Trzciński2018-05-021-1/+1
| * | | | | | Add stages_ajax endpoint to serve old HTMLKamil Trzciński2018-05-021-0/+9
| * | | | | | Merge branch 'master' into 33697-pipelines-json-endpointFilipa Lacerda2018-04-244-86/+96
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 33697-pipelines-json-endpointFilipa Lacerda2018-04-232-5/+3
| |\ \ \ \ \ \ \
| * | | | | | | | Fix stage.json endpointKamil Trzciński2018-04-231-1/+1
| * | | | | | | | Add proper stage.json dataKamil Trzciński2018-04-231-3/+3
* | | | | | | | | Merge branch '44059-specify-variables-when-executing-a-manual-pipeline-from-t...Kamil Trzciński2018-05-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Matija Čupić2018-05-028-11/+23
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Jose2018-04-3016-107/+132
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Accept variable params in create_paramsMatija Čupić2018-04-181-1/+1
* | | | | | | | | Backports every CE related change from ee-44542 to CETiago Botelho2018-05-046-16/+21
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'bvl-enforce-terms' into 'master'Douwe Maan2018-05-045-10/+137
|\ \ \ \ \ \ \ \
| * | | | | | | | Reuses `InternalRedirect` when possibleBob Van Landuyt2018-05-042-9/+4
| * | | | | | | | Enforces terms in the web applicationBob Van Landuyt2018-05-043-5/+81
| * | | | | | | | Allow a user to accept/decline termsBob Van Landuyt2018-05-041-3/+40
| * | | | | | | | Display terms to a userBob Van Landuyt2018-05-041-0/+19
* | | | | | | | | Backport IdentityLinker#failed? from GroupSaml callback flowJames Edwards-Jones2018-05-041-1/+1
|/ / / / / / / /
* | | | | | | | Remove Runner#belonging_to_any_project since this is no longer neededDylan Griffith2018-05-031-1/+0