summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-061-13/+15
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-063-10/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-033-10/+0
| * | | | | | | | | Merge branch 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-3563...Sean McGivern2017-11-061-7/+9
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Make Prometheus metrics endpoint return empty response when metrics are disabledpawel/show_empty_page_when_prometheus_metrics_are_disabled-35639Pawel Chojnacki2017-09-251-7/+9
| * | | | | | | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-067-3/+13
| * | | | | | | | | Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-061-3/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Refactor issuable destroy actionJarka Kadlecova2017-11-061-3/+6
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Add more tests to Projects::Clusters::ApplicationsController38464-k8s-appsAlessio Caiazza2017-11-061-8/+6
* | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-061-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-061-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-061-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| | | * | | | | | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| | | * | | | | | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-1/+2
| | | * | | | | | Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-211-1/+2
* | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-062-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-052-5/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | / / / | | |_|_|_|/ / / | |/| | | | | |