summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-297-13/+66
|\
| * Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' into...GitLab Release Tools Bot2019-08-292-2/+2
| |\
| | * Filter out old system notes for epicsPatrick Derichs2019-08-282-2/+2
| * | Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-292-2/+8
| |\ \
| | * | Add direct upload support for personal snippetsJan Provaznik2019-08-232-2/+8
| * | | Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-291-3/+41
| |\ \ \
| | * | | Add captcha if there are multiple failed login attemptsMałgorzata Ksionek2019-07-311-3/+41
| * | | | Merge branch 'security-mr-head-pipeline-leak' into 'master'GitLab Release Tools Bot2019-08-291-1/+8
| |\ \ \ \
| | * | | | Permission fix for MergeRequestsController#pipeline_statusdrew cimino2019-08-121-1/+8
| * | | | | Merge branch 'security-group-runners-permissions' into 'master'GitLab Release Tools Bot2019-08-291-5/+1
| |\ \ \ \ \
| | * | | | | admin_group authorization for Groups::RunnersControllerdrew cimino2019-08-221-5/+1
| * | | | | | Merge branch 'security-ci-metrics-permissions' into 'master'GitLab Release Tools Bot2019-08-291-0/+6
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Restrict MergeRequests#test_reports to authenticated users with read-access o...drew cimino2019-08-221-0/+6
* | | | | | | Make it harder to delete issuables accidentallyStan Hu2019-08-291-0/+28
* | | | | | | Reduce the number of SQL requests on MR-showIgor2019-08-281-0/+1
* | | | | | | Save board lists collapsed settingFelipe Artur2019-08-281-10/+14
* | | | | | | Merge branch 'sh-project-feature-nplus-one' into 'master'Jan Provaznik2019-08-271-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove N+1 SQL query loading project feature in dashboardsh-project-feature-nplus-oneStan Hu2019-08-231-0/+1
* | | | | | | | Add edit_note and spec for editing quick actionsPatrick Derichs2019-08-262-1/+6
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'mc/bug/nplusone-pipelines-show' into 'master'Stan Hu2019-08-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Preload tags when loading Ci::Pipelinemc/bug/nplusone-pipelines-showMatija Čupić2019-08-231-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ce-jej/fix-sso-enforced-docker-registry-auth' into 'master'Kamil Trzciński2019-08-231-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | JwtController avoids activating session checksce-jej/fix-sso-enforced-docker-registry-authJames Edwards-Jones2019-08-221-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ce-8631-archiving-a-project-should-create-an-audit-event' into ...Lin Jen-Shin2019-08-221-4/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CE: Audit event for archiving and unarchiving projectsce-8631-archiving-a-project-should-create-an-audit-eventmanojmj2019-08-211-4/+1
| |/ / / /
* | | | | Issue #39099: Add links for latest pipelinesAlex Ives2019-08-221-5/+28
* | | | | Add SortingPreference concernGeorge Koltsov2019-08-217-65/+123
* | | | | Merge branch '63372-award-emoji-services' into 'master'Grzegorz Bizon2019-08-212-18/+3
|\ \ \ \ \
| * | | | | Add service classes for mutating AwardEmojiLuke Duncalfe2019-08-211-17/+2
| * | | | | Renaming AwardedEmojiFinder to a ServiceLuke Duncalfe2019-08-211-1/+1
| |/ / / /
* | | | | New wiki page redirects user to random slug46299-wiki-page-creationLuke Duncalfe2019-08-211-5/+26
|/ / / /
* | | | Standardize remote_ip and path keys for auth.log and api_json.logStan Hu2019-08-201-2/+2
* | | | Use ActiveModel's type instead of virtusPeter Leitzen2019-08-201-1/+5
* | | | Fix N+1s queries while loading usersDouglas Barbosa Alexandre2019-08-191-2/+2
* | | | Merge branch '66023-starrers-count-do-not-match-after-searching' into 'master'Stan Hu2019-08-161-16/+2
|\ \ \ \
| * | | | Fix starrers counters after searchingDouglas Barbosa Alexandre2019-08-151-16/+2
* | | | | Merge branch '47003-user-onboarding-replace-current-email-confirmation-flow-w...Grzegorz Bizon2019-08-164-3/+37
|\ \ \ \ \
| * | | | | Incorporate feedback fixes47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flowAlex Buijs2019-08-122-2/+10
| * | | | | Don't redirect to the Almost there pageAlex Buijs2019-08-082-3/+3
| * | | | | Add ConfirmEmailWarning concernAlex Buijs2019-08-082-0/+26
* | | | | | Merge branch '24705-multi-selection-for-delete-on-registry-page' into 'master'Thong Kuah2019-08-151-1/+33
|\ \ \ \ \ \
| * | | | | | Limit registry tag bulk delete to 15 items24705-multi-selection-for-delete-on-registry-pageGiorgenes Gelatti2019-08-151-2/+10
| * | | | | | Validates tag names and tags#bulk_destroyGiorgenes Gelatti2019-07-301-0/+9
| * | | | | | Support bulk registry tag deleteGiorgenes Gelatti2019-07-301-0/+15
| | |_|_|/ / | |/| | | |
* | | | | | Allow disabling group/project email notificationsBrett Walker2019-08-152-0/+2
| |_|/ / / |/| | | |
* | | | | Merge branch 'dblessing-fix-public-project-ssh-only-ci-failure' into 'master'Douglas Barbosa Alexandre2019-08-151-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Allow CI to clone public projects when HTTP protocol is disabledDrew Blessing2019-08-141-1/+6
* | | | | Merge branch 'georgekoltsov/48854-fix-empty-flash-message' into 'master'ce-update-ff-permissions-for-new-strategiesStan Hu2019-08-151-1/+5
|\ \ \ \ \
| * | | | | Swap clauses as per code review suggestiongeorgekoltsov/48854-fix-empty-flash-messageGeorge Koltsov2019-08-151-1/+1
| * | | | | Exclude json content type from workhorse interceptionGeorge Koltsov2019-08-141-1/+5