summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-271-1/+0
* Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-261-1/+1
|\
| * Fix initial settings loading at the first run of GitLab installed from sourceAndrei Vukolov2018-06-251-1/+1
| * Update wrong initial setting transfer in application_settings_controller.rbAndrei Vukolov2018-06-211-1/+1
* | Merge branch 'update_project_flash_error_message' into 'master'Rémy Coutable2018-06-261-1/+1
|\ \
| * | Set flash error message only for current request when updating projectAram Visser2018-06-251-1/+1
* | | Bring changes from EELin Jen-Shin2018-06-262-1/+2
* | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-251-1/+1
* | | Bring changes from EELin Jen-Shin2018-06-252-4/+4
|/ /
* | Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ...Douwe Maan2018-06-224-4/+4
|\ \
| * | [Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controllerblackst0ne2018-06-214-4/+4
| |/
* | Show a reCAPTCHA on signin page if custom header is setStan Hu2018-06-211-1/+30
* | Changes tab VUE refactoringFelipe Artur2018-06-216-19/+70
* | Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' in...Rémy Coutable2018-06-211-0/+14
|\ \ | |/ |/|
| * [Rails5] Set request.format in commits_controllerblackst0ne-rails5-set-request-format-in--commits-controllerblackst0ne2018-06-201-0/+14
* | Merge branch 'rails5-fix-48142' into 'master'Rémy Coutable2018-06-201-1/+1
|\ \
| * | Rails5 fix Admin::HooksControllerJasper Maes2018-06-201-1/+1
| |/
* | Merge branch '48100-fix-branch-not-shown' into 'master'Rémy Coutable2018-06-201-2/+2
|\ \
| * | The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shownHiroyuki Sato2018-06-201-2/+2
| |/
* | Rails5 fix expected: 0 times with any arguments received: 1 time with argume...Jasper Maes2018-06-201-1/+1
|/
* Merge branch 'zj-counting-commits' into 'master'Douwe Maan2018-06-191-1/+4
|\
| * Counting commits is done by Gitalyzj-counting-commitsZeger-Jan van de Weg2018-06-191-1/+4
* | Merge branch 'rails5-fix-46276' into 'master'Rémy Coutable2018-06-191-0/+13
|\ \ | |/ |/|
| * Rails5 fix format in uploads actionsJasper Maes2018-06-181-0/+13
* | Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-183-18/+28
|\ \
| * | Render calendar feed inline when accessed from GitLabImre Farkas2018-06-183-18/+28
| |/
* | Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-...Rémy Coutable2018-06-181-0/+9
|\ \
| * | [Rails5] Set request.format for artifacts_controllerblackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404blackst0ne2018-06-161-0/+9
| |/
* | Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'Rémy Coutable2018-06-181-0/+13
|\ \
| * | [Rails5] Explicitly set request.format for blob_controllerblackst0ne-rails5-fix-blob-requests-formatblackst0ne2018-06-151-0/+13
* | | Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-181-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-151-1/+1
| |/
* | Merge branch 'rails5-fix-47836' into 'master'Yorick Peterse2018-06-151-2/+2
|\ \
| * | Rails5 fix passing Group objects array into for_projects_and_groups milestone...Jasper Maes2018-06-141-2/+2
| |/
* | Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan2018-06-151-0/+2
|\ \
| * | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-151-2/+2
| * | IDE sends last commit ID when committing changesPhil Hughes2018-06-151-0/+2
* | | Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master'Kamil Trzciński2018-06-151-0/+4
|\ \ \ | |/ / |/| |
| * | Backport InternalRedirect#sanitize_redirectce-jej/sanitize-group-saml-relay-stateJames Edwards-Jones2018-06-141-0/+4
| |/
* | Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-152-7/+6
* | Fixed linting error with trailing space in rbTim Zallmann2018-06-141-1/+1
* | Makes the html attribute in the json output optional with the option html_ren...Tim Zallmann2018-06-141-0/+2
|/
* Render access denied without messageBob Van Landuyt2018-06-131-2/+4
* Users can accept terms during registrationBob Van Landuyt2018-06-082-2/+28
* Backport of "Add assignee lists to boards"Mario de la Ossa2018-06-071-3/+11
* Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon2018-06-071-6/+1
|\
| * Force Postgres to avoid trigram indexes when in a groupSean McGivern2018-06-071-0/+1
| * Simplify issuable finder queriesSean McGivern2018-06-061-6/+0
* | Merge remote-tracking branch 'origin/master' into 38542-application-control-p...Kamil Trzciński2018-06-076-25/+50
|\ \
| * \ Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-1/+15
| |\ \
View Lorry Controller Status