summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-051-1/+18
|\
| * Fix failed spec44665-fix-db-trace-stream-by-raw-accessShinya Maeda2018-04-051-1/+2
| * Add testShinya Maeda2018-04-051-0/+16
* | Merge branch 'osw-44295-adjust-authorization-for-discussions-show' into 'master'Sean McGivern2018-04-051-0/+47
|\ \
| * | Adjust 404's for LegacyDiffNote discussion renderingOswaldo Ferreira2018-04-051-0/+47
| |/
* | Update tests for settings/ci_cd_controller_specTomasz Maczukin2018-04-041-11/+35
* | Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-042-77/+86
|/
* Merge branch 'bvl-handle-missing-attribute-when-updating-username' into 'master'Douwe Maan2018-04-041-0/+7
|\
| * Handle invalid params when trying update_usernameBob Van Landuyt2018-04-041-0/+7
* | Refactor discussions/notes codeJan Provaznik2018-04-031-1/+1
* | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-againLin Jen-Shin2018-04-031-1/+17
|/
* Fix middle alignment for the titleJose Ivan Vargas2018-03-281-1/+1
* Fix promoting labels and milestones copy textJose Ivan Vargas2018-03-281-1/+1
* Merge branch '33803-drop-json-support-in-project-milestone' into 'master'Rémy Coutable2018-03-281-2/+11
|\
| * Drop JSON response in Project Milestone along with avoiding errorTakuya Noguchi2018-03-251-2/+11
* | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-281-0/+123
|\ \
| * | Make ci/lint page context aware:Mayra Cabrera2018-03-261-0/+123
* | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-271-0/+97
|\ \ \
| * | | ProtectedBranchPolicy used from Controller for destroy/updateJames Edwards-Jones2018-03-261-0/+41
| * | | DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-261-0/+56
| | |/ | |/|
* | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-271-0/+24
* | | Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-03-271-2/+2
|\ \ \
| * | | Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-221-2/+2
* | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-274-26/+196
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-221-0/+10
| |\ \ \
| * | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-221-3/+5
| * | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-091-0/+87
| * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0815-32/+338
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | fix specsMicaël Bergeron2018-03-071-1/+0
| * | | | fix some broken specsMicaël Bergeron2018-03-061-0/+1
| * | | | another round of EE code removalMicaël Bergeron2018-03-021-6/+57
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2815-123/+549
| |\ \ \ \
| * \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-289-86/+174
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2816-46/+340
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-284-18/+4
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-5/+26
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-284-6/+21
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2855-149/+420
| |\ \ \ \ \ \ \
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-6/+5
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2823-504/+814
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2889-902/+1724
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2822-269/+1054
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-282-30/+79
* | | | | | | | | | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou...Kamil Trzciński2018-03-261-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-221-9/+9
| * | | | | | | | | | | Use secret_key and secret_value in Pipeline Schedule variablesMatija Čupić2018-03-171-8/+10
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-232-2/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-222-2/+39
* | | | | | | | | | | | Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master'Douwe Maan2018-03-231-43/+79
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Writes specs43525-limit-number-of-failed-logins-using-ldapTiago Botelho2018-03-221-43/+79
| |/ / / / / / / / / / /
View Lorry Controller Status