summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
| | | | Rename classes to (hopefully) clearer names while we're doing that.
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
| | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
* Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-111-11/+2
|
* Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-072-1/+19
|\ | | | | | | | | | | | | Create idea of read-only database Closes #37534 See merge request gitlab-org/gitlab-ce!14688
| * Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-062-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* | Find branches in all projects in the fork networkBob Van Landuyt2017-10-071-2/+5
|/
* Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master'Yorick Peterse2017-10-061-1/+1
|\ | | | | | | | | Add 1000 plus counters for jobs page See merge request gitlab-org/gitlab-ce!14507
| * Sort by id, not created_atjobs-sort-by-idKamil Trzcinski2017-09-261-1/+1
| |
* | Merge branch ↵Kamil Trzciński2017-10-061-0/+136
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| * | Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-061-6/+10
| | |
| * | Merge branch 'master' into ↵Shinya Maeda2017-10-061-7/+11
| |\ \ | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-061-3/+7
| | | |
| * | | Fix almost all unresolved comments from Docs and UX reviewKamil Trzcinski2017-10-051-2/+2
| | | |
| * | | Add ClusterPresenter. Fix Static Analysys.Shinya Maeda2017-10-061-1/+1
| | | |
| * | | Change `/google_api/authorizations/` to `/google_api/auth/`.Kamil Trzcinski2017-10-051-1/+1
| | | |
| * | | Split create_params and update_params and fix small redirect bug in controllerKamil Trzcinski2017-10-051-13/+20
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-10-051-0/+1
| |\ \ \ | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-053-13/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | Fix Rubocop failuresKamil Trzcinski2017-10-041-6/+6
| | | | | |
| * | | | | Updated messages and noticesKamil Trzcinski2017-10-041-3/+3
| | | | | |
| * | | | | Add warning messagesFilipa Lacerda2017-10-041-7/+6
| | | | | |
| * | | | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix ↵Shinya Maeda2017-10-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | static analysys.
| * | | | | Introduce serializer for ClusterEntityKamil Trzcinski2017-10-031-10/+21
| | | | | |
| * | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-042-19/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-042-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. ↵Shinya Maeda2017-10-031-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dry up workers
| * | | | | | | PollingInterval, rename to gke_clusters, has_one :clusterShinya Maeda2017-10-021-4/+6
| | | | | | | |
| * | | | | | | Use expires_in for access_token validationShinya Maeda2017-10-021-5/+11
| | | | | | | |
| * | | | | | | authorize in controller. validation in model.Shinya Maeda2017-10-011-13/+2
| | | | | | | |
| * | | | | | | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-011-42/+42
| | | | | | | |
| * | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error ↵Shinya Maeda2017-09-291-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling. Polish.
| * | | | | | | Multithreading cluster creation is done with `reactive_cache`Shinya Maeda2017-09-281-72/+21
| | | | | | | |
| * | | | | | | Delete/Update basic implementationShinya Maeda2017-09-271-2/+8
| | | | | | | |
| * | | | | | | Fetch k8s token from k8s username/passwordShinya Maeda2017-09-271-3/+20
| | | | | | | |
| * | | | | | | Add login root. Remove ceration type.Shinya Maeda2017-09-271-107/+49
| | | | | | | |
| * | | | | | | Improve ClustersControllerShinya Maeda2017-09-261-15/+18
| | | | | | | |
| * | | | | | | Create clusterShinya Maeda2017-09-261-4/+13
| | | | | | | |
| * | | | | | | Tie KubernetesServiceShinya Maeda2017-09-261-11/+29
| | | | | | | |
| * | | | | | | okShinya Maeda2017-09-261-11/+48
| | | | | | | |
| * | | | | | | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-251-0/+102
| | | | | | | |
* | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-063-0/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jarka Kadlecova2017-10-032-0/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-251-1/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue
| * | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-2010-32/+59
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-182-2/+2
| |\ \ \ \ \ \ \
| * | | | | | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-6/+1
| | | | | | | | |
| * | | | | | | | Check the discussion lock only for issuables & clean styleJarka Kadlecova2017-09-141-1/+1
| | | | | | | | |
| * | | | | | | | Support discussion locking in the backendJarka Kadlecova2017-09-143-0/+16
| | | | | | | | |
* | | | | | | | | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-051-7/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add external link for online artifacts Closes #34102 See merge request gitlab-org/gitlab-ce!14399
| * | | | | | | | Test against public projectsZeger-Jan van de Weg2017-10-051-1/+1
| | | | | | | | |
View Lorry Controller Status