summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-221-1/+2
|\
| * Add Group Milestone sortingGeorge Andrinopoulos2017-11-071-1/+2
* | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-212-11/+3
* | Impersonation no longer gets stuck on password change.Tiago Botelho2017-11-201-1/+5
* | Add issue sidebar and toggle_subscription endpoint in board issues dataOswaldo Ferreira2017-11-201-0/+1
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2011-0/+12
|\ \
| * | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1611-0/+12
* | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-171-22/+5
|\ \ \
| * | | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-171-2/+4
| * | | Applied some code review commentsFrancisco Lopez2017-11-171-2/+1
| * | | Some fixes after rebaseFrancisco Lopez2017-11-171-24/+0
| * | | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-171-1/+1
| * | | Add request throttlesMichael Kozono2017-11-171-2/+10
* | | | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-171-2/+4
* | | | Merge branch 'ci-pipeline-status-query' into 'master'Kamil Trzciński2017-11-172-1/+3
|\ \ \ \
| * | | | Optimise getting the pipeline status of commitsci-pipeline-status-queryYorick Peterse2017-11-162-1/+3
| | |/ / | |/| |
* | | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-171-2/+6
| |/ / |/| |
* | | Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-updateDouwe Maan2017-11-162-3/+8
|/ /
* | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-141-1/+6
|\ \
| * \ Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-0713-41/+51
| |\ \
| * | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-071-1/+1
| * | | Do not allow jobs to be erasedShinya Maeda2017-11-061-0/+5
* | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-141-9/+1
|\ \ \ \
| * | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-091-9/+1
* | | | | Fix access to the final page of todosSean McGivern2017-11-091-1/+1
* | | | | Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-081-1/+2
* | | | | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-083-8/+0
|\ \ \ \ \
| * | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-083-8/+0
* | | | | | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-081-2/+2
|\ \ \ \ \ \
| * | | | | | Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-2/+2
* | | | | | | Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-071-2/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | implemented using an ivar, and added specsBrett Walker2017-10-131-2/+7
| * | | | | | moved throttling into the controller. if we hit the throttlingBrett Walker2017-10-121-2/+5
| * | | | | | if the branch/tag count is over a certain limit, don't executeBrett Walker2017-10-111-2/+2
* | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-088-93/+85
|\ \ \ \ \ \ \
| * | | | | | | Refactor issuables index actionsJarka Kadlecova2017-11-077-92/+76
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-071-1/+9
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-061-1/+2
| | * | | | | fixed specsPhil Hughes2017-11-061-1/+1
| | * | | | | correctly updates commit data after committing changesPhil Hughes2017-11-061-2/+3
| | * | | | | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-061-1/+7
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-071-5/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-ite...Kamil Trzcinski2017-11-0612-23/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...move-kubernetes-from-service-to-clusters-page-10-2-verShinya Maeda2017-11-061-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...Shinya Maeda2017-11-052-5/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-se...Shinya Maeda2017-11-041-5/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-011-1/+1
| | * | | | | | | | Fix paths to the first pageKamil Trzcinski2017-11-011-9/+7
| | * | | | | | | | Adds buttons to the first page.Filipa Lacerda2017-10-271-1/+6
* | | | | | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0612-23/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |