Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bvl-dont-rename-free-names' into 'master' | Douwe Maan | 2017-10-24 | 1 | -11/+0 |
|\ | | | | | | | | | | | | | Don't rename groups/projects that aren't reserved anymore Closes #39387 See merge request gitlab-org/gitlab-ce!15029 | ||||
| * | Don't rename groups/projects that aren't reserved anymorebvl-dont-rename-free-names | Bob Van Landuyt | 2017-10-24 | 1 | -11/+0 |
| | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12932 we freed up some names. But we were still renaming them. | ||||
* | | Add new circuitbreaker properties to application_settings | Bob Van Landuyt | 2017-10-23 | 2 | -1/+19 |
|/ | |||||
* | Add existing circuitbreaker settings to the database | Bob Van Landuyt | 2017-10-17 | 2 | -1/+32 |
| | |||||
* | added date parameter for time trackinggitlab-ee-1312-time-spent-at | Vlad | 2017-10-13 | 2 | -0/+12 |
| | |||||
* | Ignore existing Migration/Datetime cop offenders | Sean McGivern | 2017-10-10 | 4 | -0/+4 |
| | |||||
* | Move migration to background | Michael Kozono | 2017-10-07 | 1 | -284/+9 |
| | |||||
* | Update DN class in migration | Michael Kozono | 2017-10-07 | 1 | -41/+60 |
| | |||||
* | Rename method to `to_normalized_s` | Michael Kozono | 2017-10-07 | 1 | -2/+2 |
| | |||||
* | Normalize existing persisted DNs | Michael Kozono | 2017-10-07 | 1 | -0/+285 |
| | |||||
* | Add a migration to populate fork networks | Bob Van Landuyt | 2017-10-07 | 1 | -0/+30 |
| | | | | This uses the existing ForkedProjectLinks | ||||
* | Allow creating merge requests across forks of a project | Bob Van Landuyt | 2017-10-07 | 1 | -1/+1 |
| | |||||
* | Create a fork network when forking a project | Bob Van Landuyt | 2017-10-07 | 2 | -0/+38 |
| | | | | | When no fork network exists for the source projects, we create a new one with the correct source | ||||
* | Add a model for `fork_networks` | Bob Van Landuyt | 2017-10-07 | 2 | -0/+36 |
| | | | | | The fork network will keep track of the root project as long as it's present. | ||||
* | Merge branch 'master' into '37970-ci-sections-tracking' | Kamil Trzciński | 2017-10-07 | 8 | -0/+240 |
|\ | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | Merge branch ↵ | Kamil Trzciński | 2017-10-06 | 2 | -0/+77 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | '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 | ||||
| | * | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-07 | 4 | -1/+76 |
| | |\ | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * | | Optimise gcp_clusters table schema | Kamil Trzcinski | 2017-10-05 | 2 | -10/+14 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 3 | -0/+73 |
| | |\ \ | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 3 | -3/+30 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 2 | -1/+40 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * | | | | | Specify defaults, fix policies, fix db columns | Kamil Trzcinski | 2017-10-04 | 2 | -15/+15 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 4 | -0/+82 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * \ \ \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 10 | -3/+166 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. ↵ | Shinya Maeda | 2017-10-03 | 2 | -49/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dry up workers | ||||
| | * | | | | | | | PollingInterval, rename to gke_clusters, has_one :cluster | Shinya Maeda | 2017-10-02 | 2 | -8/+39 |
| | | | | | | | | | |||||
| | * | | | | | | | authorize in controller. validation in model. | Shinya Maeda | 2017-10-01 | 2 | -8/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Replace reactive_cache by multipel sidekiq workers | Shinya Maeda | 2017-10-01 | 2 | -4/+20 |
| | | | | | | | | | |||||
| | * | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error ↵ | Shinya Maeda | 2017-09-29 | 2 | -15/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling. Polish. | ||||
| | * | | | | | | | Multithreading cluster creation is done with `reactive_cache` | Shinya Maeda | 2017-09-28 | 2 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Delete/Update basic implementation | Shinya Maeda | 2017-09-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add login root. Remove ceration type. | Shinya Maeda | 2017-09-27 | 2 | -10/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | ok | Shinya Maeda | 2017-09-26 | 2 | -10/+37 |
| | | | | | | | | | |||||
| | * | | | | | | | Discard unnessecary changed in schema | Shinya Maeda | 2017-09-25 | 1 | -25/+24 |
| | | | | | | | | | |||||
| | * | | | | | | | Create Kubernetes cluster on GKE from k8s service | Shinya Maeda | 2017-09-25 | 2 | -25/+72 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 2 | -0/+15 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531 | ||||
| | * | | | | | | | fix db schema | Jarka Kadlecova | 2017-10-03 | 1 | -16/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove redundant column from the schema | Jarka Kadlecova | 2017-10-03 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Jarka Kadlecova | 2017-10-03 | 8 | -2/+165 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb | ||||
| | * | | | | | | | FE review changes app code | Luke "Jared" Bennett | 2017-10-01 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 4 | -3/+23 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue | ||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-20 | 5 | -5/+81 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-18 | 5 | -3/+129 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Remove discussion_lock | Luke "Jared" Bennett | 2017-09-14 | 1 | -16/+16 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Create system notes for MR too, improve doc + clean up code | Jarka Kadlecova | 2017-09-14 | 2 | -6/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Support discussion locking in the backend | Jarka Kadlecova | 2017-09-14 | 2 | -0/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into ↵ | Douwe Maan | 2017-10-06 | 3 | -1/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for GPG subkeys in signature verification Closes #36829 See merge request gitlab-org/gitlab-ce!14517 | ||||
| | * | | | | | | | | | | | Add more specs.36829-gpg-commit-not-verified-if-signed-with-a-subkey | Rubén Dávila | 2017-10-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Small refactor and fix for RuboCop | Rubén Dávila | 2017-10-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Convert migrations to generate subkeys to a background migration | Rubén Dávila | 2017-10-05 | 3 | -62/+26 |
| | | | | | | | | | | | | |