summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-10-8-users-can-update-their-password-without-entering-...Filipa Lacerda2018-05-251-2/+0
* Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'Rémy Coutable2018-05-231-1/+1
* Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-221-0/+2
* Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-141-2/+7
* Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-111-0/+4
* 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
* | | | | | | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-039-18/+23
|\ \ \ \ \ \ \
| * | | | | | | Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-021-7/+0
| | |_|/ / / / | |/| | | | |
| * | | | | | Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-021-0/+14
| * | | | | | Merge branch 'blackst0ne-rails5-use-safe-params-instead-of-params-in-url-for-...Rémy Coutable2018-05-023-3/+3
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne2018-04-283-3/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'blackst0ne-rails5-update-application-controller-log-exception' ...Rémy Coutable2018-05-021-1/+2
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Update `ApplicationController#log_exception` to fix `undefined metho...blackst0ne2018-04-281-1/+2
| | |/ / / / /
| * | | | | | Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-021-2/+1
| |\ \ \ \ \ \
| | * | | | | | Fix file_store for artifacts and lfs when savingKamil Trzciński2018-05-011-2/+1
| | |/ / / / /
View Lorry Controller Status