Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv... | Kamil Trzciński | 2017-10-06 | 1 | -0/+45 |
|\ | |||||
| * | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-07 | 2 | -0/+32 |
| |\ | |||||
| * | | Optimise gcp_clusters table schema | Kamil Trzcinski | 2017-10-05 | 1 | -6/+10 |
| * | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub... | Kamil Trzcinski | 2017-10-05 | 2 | -0/+69 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-05 | 2 | -2/+29 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-04 | 1 | -0/+39 |
| |\ \ \ \ | |||||
| * | | | | | Specify defaults, fix policies, fix db columns | Kamil Trzcinski | 2017-10-04 | 1 | -6/+6 |
| * | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-04 | 3 | -0/+79 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-04 | 5 | -1/+87 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. d... | Shinya Maeda | 2017-10-03 | 1 | -7/+4 |
| * | | | | | | | PollingInterval, rename to gke_clusters, has_one :cluster | Shinya Maeda | 2017-10-02 | 1 | -7/+3 |
| * | | | | | | | authorize in controller. validation in model. | Shinya Maeda | 2017-10-01 | 1 | -4/+4 |
| * | | | | | | | Replace reactive_cache by multipel sidekiq workers | Shinya Maeda | 2017-10-01 | 1 | -2/+10 |
| * | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error h... | Shinya Maeda | 2017-09-29 | 1 | -10/+7 |
| * | | | | | | | Multithreading cluster creation is done with `reactive_cache` | Shinya Maeda | 2017-09-28 | 1 | -0/+1 |
| * | | | | | | | Delete/Update basic implementation | Shinya Maeda | 2017-09-27 | 1 | -1/+1 |
| * | | | | | | | Add login root. Remove ceration type. | Shinya Maeda | 2017-09-27 | 1 | -9/+0 |
| * | | | | | | | ok | Shinya Maeda | 2017-09-26 | 1 | -6/+28 |
| * | | | | | | | Create Kubernetes cluster on GKE from k8s service | Shinya Maeda | 2017-09-25 | 1 | -0/+29 |
* | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu... | Jarka Kadlecova | 2017-10-03 | 4 | -0/+86 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 2 | -1/+20 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-20 | 3 | -0/+75 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-18 | 2 | -0/+56 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Create system notes for MR too, improve doc + clean up code | Jarka Kadlecova | 2017-09-14 | 1 | -4/+1 |
| * | | | | | | | | | | Support discussion locking in the backend | Jarka Kadlecova | 2017-09-14 | 1 | -0/+16 |
* | | | | | | | | | | | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'ma... | Douwe Maan | 2017-10-06 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Address some feedback from last code review | Rubén Dávila | 2017-10-05 | 1 | -2/+2 |
| * | | | | | | | | | | | Convert migration to a post deployment migration | Rubén Dávila | 2017-10-05 | 1 | -59/+0 |
| * | | | | | | | | | | | Add migration to generate GpgKeySubkeys records and update signatures | Rubén Dávila | 2017-10-05 | 1 | -0/+59 |
| * | | | | | | | | | | | Add some basic specs and refactor model and validations | Rubén Dávila | 2017-10-05 | 2 | -11/+13 |
| * | | | | | | | | | | | Add missing DOWNTIME declaration | Rubén Dávila | 2017-10-05 | 1 | -0/+2 |
| * | | | | | | | | | | | Associate GgpSignature with GpgKeySubkey if comes from a subkey | Rubén Dávila | 2017-10-05 | 1 | -0/+10 |
| * | | | | | | | | | | | Use a separate model to handle GPG subkeys | Rubén Dávila | 2017-10-05 | 2 | -10/+9 |
| * | | | | | | | | | | | Process and create subkeys when a new GPG key is created | Rubén Dávila | 2017-10-05 | 1 | -0/+10 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master' | Grzegorz Bizon | 2017-10-06 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add failure_reason column to ci_pipelines | Grzegorz Bizon | 2017-10-05 | 1 | -0/+9 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e... | Douwe Maan | 2017-10-05 | 10 | -1/+232 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Add a new migration to make sure that fast forward column exists in projects ...fix_migration_with_fast_forward_option | Valery Sizov | 2017-10-04 | 2 | -1/+28 |
| * | | | | | | | | | Fix AddFastForwardOptionToProject migration | Valery Sizov | 2017-10-04 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'add-ci-builds-index-for-jobscontroller' into 'master' | Kamil Trzciński | 2017-10-03 | 1 | -0/+39 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Change index on ci_builds to optimize Jobs Controlleradd-ci-builds-index-for-jobscontroller | Greg Stark | 2017-10-03 | 1 | -0/+39 |
| * | | | | | | | | Add (partial) index on Labels.template | Greg Stark | 2017-10-03 | 1 | -0/+45 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee | Valery Sizov | 2017-10-02 | 1 | -0/+33 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Merge branch 'add-composite-index-on-merge-requests-merge-commit-sha' into 'm... | Sean McGivern | 2017-09-29 | 1 | -0/+33 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Add index for merge_requests.merge_commit_shaadd-composite-index-on-merge-requests-merge-commit-sha | Yorick Peterse | 2017-09-28 | 1 | -0/+33 |
| * | | | | | | | | [Port semi-linear history from EE] Move migration to CE and `merge_method` me... | Valery Sizov | 2017-09-29 | 1 | -0/+17 |
| * | | | | | | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-28 | 2 | -0/+26 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'hashed-storage-migration-path' into 'master' | Douwe Maan | 2017-09-28 | 1 | -0/+9 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | [Backported from EE] Readonly flag for Projects | Gabriel Mazetto | 2017-09-28 | 1 | -0/+9 |
| | | |/ / / / / / |