| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | Updates sidebar | Filipa Lacerda | 2017-10-02 | 6 | -23/+18 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch ↵ | Filipa Lacerda | 2017-10-02 | 14 | -52/+127 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service * 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce: PollingInterval, rename to gke_clusters, has_one :cluster Use expires_in for access_token validation | |||||
| | | | * | | | | | | | | | | | PollingInterval, rename to gke_clusters, has_one :cluster | Shinya Maeda | 2017-10-02 | 12 | -43/+91 | |
| | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Use expires_in for access_token validation | Shinya Maeda | 2017-10-02 | 4 | -9/+36 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Starts edit form | Filipa Lacerda | 2017-10-02 | 4 | -10/+68 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Adds clusters to the navigation bar | Filipa Lacerda | 2017-10-02 | 4 | -4/+10 | |
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new line at the end of files | |||||
| | | * | | | | | | | | | | | authorize in controller. validation in model. | Shinya Maeda | 2017-10-01 | 9 | -41/+69 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Revert KubernetesService. Introduce FetchKubernetesTokenService. | Shinya Maeda | 2017-10-01 | 9 | -84/+127 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Replace reactive_cache by multipel sidekiq workers | Shinya Maeda | 2017-10-01 | 16 | -190/+324 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Adds login page, sidebar, header and form | Filipa Lacerda | 2017-09-29 | 6 | -13/+72 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error ↵ | Shinya Maeda | 2017-09-29 | 7 | -55/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling. Polish. | |||||
| | | * | | | | | | | | | | | Multithreading cluster creation is done with `reactive_cache` | Shinya Maeda | 2017-09-28 | 9 | -86/+141 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Delete/Update basic implementation | Shinya Maeda | 2017-09-27 | 4 | -5/+13 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Fetch k8s token from k8s username/password | Shinya Maeda | 2017-09-27 | 4 | -6/+39 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Add login root. Remove ceration type. | Shinya Maeda | 2017-09-27 | 12 | -163/+80 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Remove sensitive literal data | Shinya Maeda | 2017-09-27 | 2 | -2/+1 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Improve ClustersController | Shinya Maeda | 2017-09-26 | 3 | -26/+54 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Create cluster | Shinya Maeda | 2017-09-26 | 6 | -39/+61 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Bump google-api-client Gem from 0.8.6 to 0.13.6 | Shinya Maeda | 2017-09-26 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Only update gems we need | Lin Jen-Shin | 2017-09-26 | 1 | -31/+33 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | ok | Shinya Maeda | 2017-09-26 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Tie KubernetesService | Shinya Maeda | 2017-09-26 | 4 | -13/+33 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | ok | Shinya Maeda | 2017-09-26 | 6 | -41/+110 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | 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 | 13 | -25/+323 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 72 | -129/+1281 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531 | |||||
| | | * | | | | | | | | | | | | Fix JS lock issue specs | Sean McGivern | 2017-10-06 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | UX review18608-lock-issues-v2 | Luke "Jared" Bennett | 2017-10-06 | 5 | -2/+11 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Fix wording in the js messages | Jarka Kadlecova | 2017-10-06 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Refactor discussion lock docs | Achilleas Pipinellis | 2017-10-05 | 2 | -10/+21 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Add documentation for discussion lock | Jarka Kadlecova | 2017-10-04 | 6 | -0/+30 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Merge branch '18608-lock-issues-v2' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Luke "Jared" Bennett | 2017-10-03 | 621 | -7109/+11882 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 | |||||
| | | | * | | | | | | | | | | | | 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 | 621 | -7092/+11866 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb | |||||
| | | * | | | | | | | | | | | | | | Remove interpolated translation strings | Luke "Jared" Bennett | 2017-10-03 | 2 | -7/+8 | |
| | | |/ / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | Further review changes | Luke "Jared" Bennett | 2017-10-02 | 3 | -11/+10 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | FE review changes app code | Luke "Jared" Bennett | 2017-10-01 | 9 | -24/+41 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Fix md-area top border-radius with issue issuable-note-warning | Luke "Jared" Bennett | 2017-09-29 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Correct disabled note form style18608-lock-issues | Luke "Jared" Bennett | 2017-09-27 | 3 | -7/+30 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Fix karma | Luke "Jared" Bennett | 2017-09-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Fix locked and unlocked icons | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Fix static analysis | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | fix code style | Jarka Kadlecova | 2017-09-27 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | add discussion lock icon to the system_note_helper | Jarka Kadlecova | 2017-09-26 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | update changelog | Jarka Kadlecova | 2017-09-26 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # changelogs/unreleased/18608-lock-issues.yml | |||||
| | | * | | | | | | | | | | | | | use downcase instead of underscore | Jarka Kadlecova | 2017-09-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | add feature specs for discussion lock | Jarka Kadlecova | 2017-09-26 | 3 | -1/+156 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Disable comment form when discussion locked for user | Jarka Kadlecova | 2017-09-26 | 4 | -5/+26 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 477 | -3824/+7739 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |