Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master' | Yorick Peterse | 2017-10-06 | 1 | -1/+1 |
|\ | |||||
| * | Sort by id, not created_atjobs-sort-by-id | Kamil Trzcinski | 2017-09-26 | 1 | -1/+1 |
* | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv... | Kamil Trzciński | 2017-10-06 | 1 | -0/+136 |
|\ \ | |||||
| * | | Improve redirect uri state and fix all remaining tests | Kamil Trzcinski | 2017-10-06 | 1 | -6/+10 |
| * | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-06 | 1 | -7/+11 |
| |\ \ | |||||
| * | | | Security fix: redirection in google_api/authorizations_controller | Shinya Maeda | 2017-10-06 | 1 | -3/+7 |
| * | | | Fix almost all unresolved comments from Docs and UX review | Kamil Trzcinski | 2017-10-05 | 1 | -2/+2 |
| * | | | Add ClusterPresenter. Fix Static Analysys. | Shinya Maeda | 2017-10-06 | 1 | -1/+1 |
| * | | | Change `/google_api/authorizations/` to `/google_api/auth/`. | Kamil Trzcinski | 2017-10-05 | 1 | -1/+1 |
| * | | | Split create_params and update_params and fix small redirect bug in controller | Kamil Trzcinski | 2017-10-05 | 1 | -13/+20 |
| * | | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub... | Kamil Trzcinski | 2017-10-05 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-05 | 3 | -13/+37 |
| |\ \ \ \ | |||||
| * | | | | | Fix Rubocop failures | Kamil Trzcinski | 2017-10-04 | 1 | -6/+6 |
| * | | | | | Updated messages and notices | Kamil Trzcinski | 2017-10-04 | 1 | -3/+3 |
| * | | | | | Add warning messages | Filipa Lacerda | 2017-10-04 | 1 | -7/+6 |
| * | | | | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix stat... | Shinya Maeda | 2017-10-04 | 1 | -3/+2 |
| * | | | | | Introduce serializer for ClusterEntity | Kamil Trzcinski | 2017-10-03 | 1 | -10/+21 |
| * | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-04 | 2 | -19/+7 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-... | Shinya Maeda | 2017-10-04 | 2 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. d... | Shinya Maeda | 2017-10-03 | 1 | -9/+19 |
| * | | | | | | | PollingInterval, rename to gke_clusters, has_one :cluster | Shinya Maeda | 2017-10-02 | 1 | -4/+6 |
| * | | | | | | | Use expires_in for access_token validation | Shinya Maeda | 2017-10-02 | 1 | -5/+11 |
| * | | | | | | | authorize in controller. validation in model. | Shinya Maeda | 2017-10-01 | 1 | -13/+2 |
| * | | | | | | | Replace reactive_cache by multipel sidekiq workers | Shinya Maeda | 2017-10-01 | 1 | -42/+42 |
| * | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error h... | Shinya Maeda | 2017-09-29 | 1 | -9/+31 |
| * | | | | | | | Multithreading cluster creation is done with `reactive_cache` | Shinya Maeda | 2017-09-28 | 1 | -72/+21 |
| * | | | | | | | Delete/Update basic implementation | Shinya Maeda | 2017-09-27 | 1 | -2/+8 |
| * | | | | | | | Fetch k8s token from k8s username/password | Shinya Maeda | 2017-09-27 | 1 | -3/+20 |
| * | | | | | | | Add login root. Remove ceration type. | Shinya Maeda | 2017-09-27 | 1 | -107/+49 |
| * | | | | | | | Improve ClustersController | Shinya Maeda | 2017-09-26 | 1 | -15/+18 |
| * | | | | | | | Create cluster | Shinya Maeda | 2017-09-26 | 1 | -4/+13 |
| * | | | | | | | Tie KubernetesService | Shinya Maeda | 2017-09-26 | 1 | -11/+29 |
| * | | | | | | | ok | Shinya Maeda | 2017-09-26 | 1 | -11/+48 |
| * | | | | | | | Create Kubernetes cluster on GKE from k8s service | Shinya Maeda | 2017-09-25 | 1 | -0/+102 |
* | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 3 | -0/+11 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu... | Jarka Kadlecova | 2017-10-03 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-20 | 10 | -32/+59 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-18 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Create system notes for MR too, improve doc + clean up code | Jarka Kadlecova | 2017-09-14 | 1 | -6/+1 |
| * | | | | | | | | Check the discussion lock only for issuables & clean style | Jarka Kadlecova | 2017-09-14 | 1 | -1/+1 |
| * | | | | | | | | Support discussion locking in the backend | Jarka Kadlecova | 2017-09-14 | 3 | -0/+16 |
* | | | | | | | | | Merge branch '34102-online-view-of-artifacts-fe' into 'master' | Nick Thomas | 2017-10-05 | 1 | -7/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Test against public projects | Zeger-Jan van de Weg | 2017-10-05 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into 34102-online-view-of-artifacts-fe | Eric Eastwood | 2017-10-04 | 2 | -19/+7 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Redirect to pages daemon | Zeger-Jan van de Weg | 2017-10-03 | 1 | -7/+11 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sh-fix-username-logging' into 'master' | Sean McGivern | 2017-10-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix username and ID not logging in production_json.log for Git activitysh-fix-username-logging | Stan Hu | 2017-10-04 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '26890-fix-default-branches-sorting' into 'master' | Robert Speicher | 2017-10-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sorting | Rémy Coutable | 2017-09-25 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | |