summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-251-0/+4
* Merge branch 'dz-refactor-cluster-apps-schedule' into 'master'Douwe Maan2018-05-241-3/+4
|\
| * Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-scheduleDmitriy Zaporozhets2018-05-241-3/+4
* | Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-241-2/+2
|\ \
| * | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-211-2/+2
| |/
* | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-231-1/+1
|\ \
| * | Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu...Rémy Coutable2018-05-231-1/+1
* | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-1/+1
|/ /
* | CE backport - Allow viewing only one board when multiple issue boards is not ...ce_backport_issue_5128Felipe Artur2018-05-222-6/+14
* | Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into '...Douwe Maan2018-05-222-4/+4
|\ \ | |/ |/|
| * Fixed badge api endpoint route when relative_url is setfj-46411-fix-badge-api-endpoint-route-with-relative-urlFrancisco Javier López2018-05-172-4/+4
* | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-173-3/+10
|\ \
| * | Backport changes from EE to minimize the CE/EE diff in Projects::Settings::In...6020-extract-ee-specific-controller-linesRémy Coutable2018-05-161-1/+8
| * | Introduce a new Keys::DestroyService serviceRémy Coutable2018-05-161-1/+1
| * | Add :weight as an allowed serializable field in app/controllers/boards/issues...Rémy Coutable2018-05-161-1/+1
* | | Exclude coverage data from the pipelines pageYorick Peterse2018-05-171-1/+1
* | | Preload pipeline data for project pipelinesYorick Peterse2018-05-171-1/+1
* | | Limit the number of pipelines to countYorick Peterse2018-05-171-11/+10
* | | Resolve "Opening Project with invite but without accepting leads to 404 error...🙈 jacopo beschi 🙉2018-05-173-1/+22
* | | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-2/+6
|\ \ \
| * | | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-2/+6
* | | | 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
| |_|/ / |/| | |