summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Commenting on image diffsFelipe Artur2017-10-076-59/+236
* Gitaly feature flag metadataAndrew Newdigate2017-10-061-2/+19
* Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-067-0/+160
|\
| * Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serviceShinya Maeda2017-10-071-3/+8
| |\
| | * Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-061-3/+8
| * | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0714-59/+182
| |\ \ | | |/ | |/|
| * | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0611-122/+178
| |\ \
| * | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-061-0/+5
| * | | Use utc for time comparisionShinya Maeda2017-10-061-3/+8
| * | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-0519-107/+115
| |\ \ \
| * | | | spec/lib/google_api/auth_spec. spec/lib/google_api/cloud_platform/client_specShinya Maeda2017-10-051-1/+2
| * | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-056-20/+84
| |\ \ \ \
| * | | | | Added usage pingKamil Trzcinski2017-10-041-0/+1
| * | | | | Fix static anlysys. Added safe_model_attributes.Shinya Maeda2017-10-042-1/+2
| * | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-042-1/+13
| |\ \ \ \ \
| * | | | | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix stat...Shinya Maeda2017-10-045-9/+11
| * | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0412-6/+216
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0457-505/+1187
| |\ \ \ \ \ \ \
| * | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. d...Shinya Maeda2017-10-031-26/+6
| * | | | | | | | PollingInterval, rename to gke_clusters, has_one :clusterShinya Maeda2017-10-022-1/+14
| * | | | | | | | Use expires_in for access_token validationShinya Maeda2017-10-022-1/+18
| * | | | | | | | Revert KubernetesService. Introduce FetchKubernetesTokenService.Shinya Maeda2017-10-011-3/+6
| * | | | | | | | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-012-19/+11
| * | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error h...Shinya Maeda2017-09-291-4/+20
| * | | | | | | | Multithreading cluster creation is done with `reactive_cache`Shinya Maeda2017-09-281-13/+5
| * | | | | | | | Add login root. Remove ceration type.Shinya Maeda2017-09-271-16/+18
| * | | | | | | | Remove sensitive literal dataShinya Maeda2017-09-271-1/+0
| * | | | | | | | Improve ClustersControllerShinya Maeda2017-09-261-10/+35
| * | | | | | | | Create clusterShinya Maeda2017-09-261-19/+30
| * | | | | | | | Tie KubernetesServiceShinya Maeda2017-09-261-1/+1
| * | | | | | | | okShinya Maeda2017-09-261-2/+17
| * | | | | | | | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-252-0/+75
* | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-064-2/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-0354-501/+1149
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-2524-73/+265
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-2023-128/+460
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-189-24/+226
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-142-8/+3
| * | | | | | | | | | | | Support discussion lock in the APIJarka Kadlecova2017-09-144-2/+14
* | | | | | | | | | | | | Merge branch 'api-sentry-extra' into 'master'Douwe Maan2017-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Send API parameters as extra data for sentry errorsapi-sentry-extraAlejandro Rodríguez2017-10-051-1/+1
* | | | | | | | | | | | | | Merge branch 'valid-branch-name-dash-bug' into 'master'Sean McGivern2017-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Prevent branches or tags from starting with invalid characters (e.g. -, .)valid-branch-name-dash-bugJacob Schatz2017-10-051-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'ma...Douwe Maan2017-10-064-3/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Don't call update signature worker when there aren't subkeysRubén Dávila2017-10-051-1/+4
| * | | | | | | | | | | | | | Convert migrations to generate subkeys to a background migrationRubén Dávila2017-10-051-0/+50
| * | | | | | | | | | | | | | Address some feedback from last code reviewRubén Dávila2017-10-051-0/+2
| * | | | | | | | | | | | | | Address feedback from last code reviewRubén Dávila2017-10-053-15/+7
| * | | | | | | | | | | | | | Consider GPG subkeys when trying to update invalid GPG signaturesRubén Dávila2017-10-051-1/+2
| * | | | | | | | | | | | | | Associate GgpSignature with GpgKeySubkey if comes from a subkeyRubén Dávila2017-10-051-2/+12