summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
* | Refactor discussions/notes codeJan Provaznik2018-04-033-3/+7
* | Merge branch '44861-mark-gitaly-nplus-one-again' into 'master'Rémy Coutable2018-04-031-3/+7
|\ \ | |/ |/|
| * Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-againLin Jen-Shin2018-04-031-3/+7
* | Added rescue to show a custom error when testing project integrationsFrancisco Javier López2018-04-021-0/+2
* | Backport changes in EE MR 4972: System Header and FooterAndré Luís2018-04-021-4/+14
|/
* Fix middle alignment for the titleJose Ivan Vargas2018-03-282-2/+2
* Fix promoting labels and milestones copy textJose Ivan Vargas2018-03-282-3/+3
* Merge branch '44657-reuse-root_ref_hash-on-branches' into 'master'Rémy Coutable2018-03-281-10/+6
|\
| * Reuse root_ref_hash for performance on BranchesTakuya Noguchi2018-03-281-10/+6
* | Merge branch '33803-drop-json-support-in-project-milestone' into 'master'Rémy Coutable2018-03-281-0/+4
|\ \
| * | Drop JSON response in Project Milestone along with avoiding errorTakuya Noguchi2018-03-251-0/+4
* | | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-283-18/+30
|\ \ \
| * | | Changes ci/lints controller to use authorize before actionMayra Cabrera2018-03-261-5/+1
| * | | Build ci/lint pageMayra Cabrera2018-03-261-3/+3
| * | | Make ci/lint page context aware:Mayra Cabrera2018-03-262-15/+31
| | |/ | |/|
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-28/+24
|\ \ \
| * | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-28/+24
* | | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-273-13/+17
|\ \ \ \
| * | | | DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-263-13/+17
| | |_|/ | |/| |
* | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-271-0/+4
| |/ / |/| |
* | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-276-32/+70
|\ \ \ | |_|/ |/| |
| * | fix the failing specsMicaël Bergeron2018-03-221-1/+2
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-222-0/+12
| |\ \
| * | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-092-10/+10
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0843-237/+456
| |\ \ \
| * | | | Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-081-5/+13
| * | | | fixing some broken mergesMicaël Bergeron2018-03-022-4/+3
| * | | | remove geo specific codeMicaël Bergeron2018-03-011-8/+24
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2838-135/+230
| |\ \ \ \
| * \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2840-130/+286
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2829-82/+157
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-285-103/+86
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-0/+2
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-285-86/+103
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2844-99/+269
| |\ \ \ \ \ \ \
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-3/+2
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2854-242/+445
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2847-381/+440
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2858-239/+614
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-284-7/+20
* | | | | | | | | | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou...Kamil Trzciński2018-03-263-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-223-3/+3
| * | | | | | | | | | | Use secret_key and secret_value in Pipeline Schedule variablesMatija Čupić2018-03-171-1/+1
| * | | | | | | | | | | Alias secret_key and secret_value to key and valueMatija Čupić2018-03-172-12/+2
| * | | | | | | | | | | Use secret_key and secret_value in Variables controllerMatija Čupić2018-03-162-4/+14
* | | | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-231-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-221-0/+22
* | | | | | | | | | | | | Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master'Douwe Maan2018-03-231-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Writes specs43525-limit-number-of-failed-logins-using-ldapTiago Botelho2018-03-221-2/+4
| * | | | | | | | | | | | | Tracks the number of failed attempts made by a user trying to authenticate wi...Tiago Botelho2018-03-221-0/+10
| |/ / / / / / / / / / / /