summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-3861-use-serializers-for-project-group-boards' into 'master'Stan Hu2019-06-132-1/+13
|\
| * Add `to_json` to `represent` method callce-3861-use-serializers-for-project-group-boardscharlieablett2019-06-131-1/+1
| * Add `to_json` to `represent` method callcharlieablett2019-06-101-1/+1
| * Use serialization for project boardscharlieablett2019-06-062-1/+13
* | Refactor for cleaner caching in dashboardsSarah Yasonik2019-06-131-1/+1
* | Revert "Avoid loading objects from DB in ES results"Nick Thomas2019-06-131-1/+0
* | Remove the grafana_dashboard_link feature flagReuben Pereira2019-06-122-5/+0
* | Whitelist query limiting admin usage data endpointPeter Leitzen2019-06-121-0/+6
* | Update merge options for auto merge strategiesShinya Maeda2019-06-121-3/+9
* | Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-111-1/+5
* | Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-111-1/+1
|\ \
| * | Return no_content from prometheus API empty responseSimon Knox2019-06-061-1/+1
| |/
* | Merge branch 'sh-fix-fogbugz-import' into 'master'James Lopez2019-06-101-2/+6
|\ \
| * | Fix Fogbugz Importer not workingsh-fix-fogbugz-importStan Hu2019-06-091-2/+6
* | | Externalize strings of email page in user profileantony liu2019-06-101-2/+2
|/ /
* | Merge branch 'ee-9688-fe-mr-merge-order' into 'master'Clement Ho2019-06-071-3/+7
|\ \
| * | Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-orderSam Bigelow2019-06-051-3/+7
* | | Merge branch '62418-project-default-git-depth' into 'master'Kamil Trzciński2019-06-071-1/+2
|\ \ \
| * | | Add project level git depth settingKrasimir Angelov2019-06-061-1/+2
| | |/ | |/|
* | | Remove metrics_time_window feature flagSarah Yasonik2019-06-072-6/+0
* | | Add frontend support for cluster health alertsAdriel Santiago2019-06-062-0/+5
* | | Add pages domains acme ordersVladimir Shushlin2019-06-061-0/+17
|/ /
* | Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'Sean McGivern2019-06-061-0/+1
|\ \
| * | Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_dbMario de la Ossa2019-06-051-0/+1
| |/
* | Avoid setting Gitlab::Session on Git HTTP requestsce-jej/fix-git-http-with-sso-enforcementJames Edwards-Jones2019-06-051-0/+1
* | Avoid setting Gitlab::Session on sessionless requestsJames Edwards-Jones2019-06-051-0/+2
|/
* Merge branch '28996-create-mvc-ui-in-haml' into 'master'Filipa Lacerda2019-06-051-2/+2
|\
| * Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-hamlNathan Friend2019-06-031-2/+2
* | Add render_projects method to controllerMartin Wortschack2019-06-051-6/+13
* | Merge branch '58941-use-gitlab-serverless-with-existing-knative-installation'...Grzegorz Bizon2019-06-041-6/+4
|\ \
| * | Adapt functions to work for external KnativeJoão Cunha2019-05-291-6/+4
* | | Fix project settings not being able to updateStan Hu2019-06-031-0/+2
| |/ |/|
* | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-031-5/+1
|\ \
| * | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-311-5/+1
* | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-035-3/+40
|\ \ \
| * \ \ Merge branch 'security-jej/prevent-web-sign-in-bypass' into 'master'GitLab Release Tools Bot2019-06-031-0/+9
| |\ \ \
| | * | | Prevent password sign in restriction bypassJames Edwards-Jones2019-05-211-0/+9
| * | | | Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'GitLab Release Tools Bot2019-06-033-2/+24
| |\ \ \ \
| | * | | | Hide password on import by url formIgor Drozdov2019-05-293-2/+24
| * | | | | Merge branch 'security-fix-confidential-issue-label-visibility-master' into '...GitLab Release Tools Bot2019-06-031-1/+7
| |\ \ \ \ \
| | * | | | | Fix confidential issue label disclosure on milestone viewPatrick Derichs2019-05-141-1/+7
* | | | | | | Abstract auto merge processesShinya Maeda2019-06-031-29/+13
| |_|_|_|/ / |/| | | | |
* | | | | | Send notifications to group-specific email addressWei-Meng Lee2019-05-311-0/+24
* | | | | | Merge branch 'bvl-phabricator-import-issues' into 'master'Phil Hughes2019-05-312-1/+40
|\ \ \ \ \ \
| * | | | | | Setup Phabricator importBob Van Landuyt2019-05-312-1/+40
* | | | | | | Merge branch 'i18n-Two_Factor_Authentication-of-user-profile' into 'master'Bob Van Landuyt2019-05-312-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-312-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'i18n-password-of-user-profile' into 'master'Bob Van Landuyt2019-05-311-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Externalize strings of password page in user profileantonyliu2019-05-291-5/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '9121-sort-relative-position' into 'master'docs/create-table-driven-standardsSean McGivern2019-05-301-0/+6
|\ \ \ \ \ \
View Lorry Controller Status