Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adds missing links, uses value instead of placeholder in input field and ↵ | Filipa Lacerda | 2018-02-20 | 8 | -18/+34 |
| | | | | properly sets the ip key | ||||
* | Update feature spec for kubernetes applications ingress IP address (#42643) | Dylan Griffith | 2018-02-20 | 1 | -0/+10 |
| | |||||
* | Schedule Ingress IP address fetch from K8s after clusters page load (#42643) | Dylan Griffith | 2018-02-20 | 5 | -0/+53 |
| | |||||
* | Refactor ingress IP address waiting code (#42643) | Dylan Griffith | 2018-02-20 | 10 | -92/+141 |
| | |||||
* | Adds support to render the IP address in the application ingress row | Filipa Lacerda | 2018-02-19 | 5 | -27/+189 |
| | | | | | Updates components to use a slot to allow to reuse the clipboard button Adds tests | ||||
* | [ci skip] Merge branch 'master' into ↵ | Filipa Lacerda | 2018-02-19 | 224 | -1422/+2241 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42643-persist-external-ip-of-ingress-controller-gke * master: (114 commits) Fix Error 500 when viewing a commit with a GPG signature in Geo Remember assignee when moving an issue Add changelog entry Allow oxford commas and spaces before commas in MR issue closing pattern. Don't cache a nil repository root ref to prevent caching issues Add back database changes for Ci::Build Revert "Merge branch 'expired-ci-artifacts' into 'master'" Fix order dependencies in some specs migrate admin:users:* to static bundle correct for missing break statement in dispatcher.js alias create and update actions to new and edit migrate projects:merge_requests:edit to static bundle migrate projects:merge_requests:creations:diffs to static bundle migrate projects:merge_requests:creations:new to static bundle migrate projects:issues:new and projects:issues:edit to static bundle migrate projects:branches:index to static bundle migrate projects:branches:new to static bundle migrate projects:compare:show to static bundle migrate projects:environments:metrics to static bundle migrate projects:milestones:* and groups:milestones:* to static bundle ... | ||||
| * | Merge branch 'ee-webpack-backport' into 'master' | Filipa Lacerda | 2018-02-19 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Backport webpack.config.js changes from EE See merge request gitlab-org/gitlab-ce!17185 | ||||
| | * | Backport webpack.config.js changes from EEee-webpack-backport | Phil Hughes | 2018-02-16 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master' | Douwe Maan | 2018-02-19 | 3 | -2/+33 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when viewing a commit with a GPG signature in Geo Closes gitlab-ee#4825 See merge request gitlab-org/gitlab-ce!17207 | ||||
| | * | | Fix Error 500 when viewing a commit with a GPG signature in Geo | Stan Hu | 2018-02-19 | 3 | -2/+33 |
| | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#4825 | ||||
| * | | | Merge branch '41949-move' into 'master' | Douwe Maan | 2018-02-19 | 3 | -1/+29 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Remember assignee when moving an issue See merge request gitlab-org/gitlab-ce!17116 | ||||
| | * | | | Remember assignee when moving an issue41949-move | Jan Provaznik | 2018-02-18 | 3 | -1/+29 |
| | |/ / | | | | | | | | | | | | | Related to #41949 | ||||
| * | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵ | Douwe Maan | 2018-02-19 | 8 | -43/+213 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138 | ||||
| | * | | Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-saving | Rubén Dávila | 2018-02-16 | 6 | -45/+119 |
| | | | | |||||
| | * | | Revert "Merge branch ↵ | Rubén Dávila | 2018-02-15 | 6 | -17/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f. | ||||
| * | | | Merge branch '17500-mr-multiple-issues-oxford-comma' into 'master' | Stan Hu | 2018-02-18 | 3 | -1/+20 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issue closing pattern to be more forgiving Closes #17500 See merge request gitlab-org/gitlab-ce!17198 | ||||
| | * | | | Add changelog entry | Vicky Chijwani | 2018-02-17 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Allow oxford commas and spaces before commas in MR issue closing pattern. | Vicky Chijwani | 2018-02-17 | 2 | -1/+15 |
| | | | | | |||||
| * | | | | Merge branch 'revert-215dff76' into 'master' | Ian Baum | 2018-02-17 | 2 | -38/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'" See merge request gitlab-org/gitlab-ce!17193 | ||||
| | * | | | Add back database changes for Ci::Buildrevert-215dff76 | Stan Hu | 2018-02-16 | 3 | -2/+27 |
| | | | | | |||||
| | * | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'" | Stan Hu | 2018-02-16 | 5 | -65/+6 |
| | | | | | | | | | | | | | | | This reverts merge request !16578 | ||||
| * | | | | Merge branch 'dm-dont-cache-nil-root-ref' into 'master' | Stan Hu | 2018-02-17 | 2 | -6/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't cache a nil repository root ref to prevent caching issues See merge request gitlab-org/gitlab-ce!17179 | ||||
| | * | | | | Don't cache a nil repository root ref to prevent caching issuesdm-dont-cache-nil-root-ref | Douwe Maan | 2018-02-16 | 2 | -6/+7 |
| | |/ / / | |||||
| * | | | | Merge branch '43296-fix-specs-broken-by-hardcoding-paths' into 'master' | Robert Speicher | 2018-02-16 | 4 | -5/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Fix order dependencies in some specs Closes #43296 See merge request gitlab-org/gitlab-ce!17189 | ||||
| | * | | | Fix order dependencies in some specs | Nick Thomas | 2018-02-16 | 4 | -5/+5 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Our automatically-generated project paths are of the form project<N>. If a spec manually specifies a project path of that form, it may conflict with the automatically-generated paths in some circumstances. | ||||
| * | | | Merge branch 'fix-more-dispatcher-stuff' into 'master' | Jacob Schatz | 2018-02-16 | 31 | -206/+54 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Remove more route-based chunks from dispatcher.js See merge request gitlab-org/gitlab-ce!16901 | ||||
| | * | | | migrate admin:users:* to static bundlefix-more-dispatcher-stuff | Mike Greiling | 2018-02-16 | 4 | -24/+4 |
| | | | | | |||||
| | * | | | correct for missing break statement in dispatcher.js | Mike Greiling | 2018-02-16 | 2 | -0/+1 |
| | | | | | |||||
| | * | | | alias create and update actions to new and edit | Mike Greiling | 2018-02-16 | 1 | -4/+11 |
| | | | | | |||||
| | * | | | migrate projects:merge_requests:edit to static bundle | Mike Greiling | 2018-02-16 | 2 | -6/+1 |
| | | | | | |||||
| | * | | | migrate projects:merge_requests:creations:diffs to static bundle | Mike Greiling | 2018-02-16 | 2 | -6/+1 |
| | | | | | |||||
| | * | | | migrate projects:merge_requests:creations:new to static bundle | Mike Greiling | 2018-02-16 | 2 | -6/+2 |
| | | | | | |||||
| | * | | | migrate projects:issues:new and projects:issues:edit to static bundle | Mike Greiling | 2018-02-16 | 3 | -16/+2 |
| | | | | | |||||
| | * | | | migrate projects:branches:index to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate projects:branches:new to static bundle | Mike Greiling | 2018-02-16 | 2 | -11/+3 |
| | | | | | |||||
| | * | | | migrate projects:compare:show to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate projects:environments:metrics to static bundle | Mike Greiling | 2018-02-16 | 2 | -6/+1 |
| | | | | | |||||
| | * | | | migrate projects:milestones:* and groups:milestones:* to static bundle | Mike Greiling | 2018-02-16 | 5 | -28/+4 |
| | | | | | |||||
| | * | | | migrate explore:groups:index to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate explore:projects:* to static bundle | Mike Greiling | 2018-02-16 | 2 | -8/+1 |
| | | | | | |||||
| | * | | | migrate dashboard:projects:* to static bundle | Mike Greiling | 2018-02-16 | 2 | -27/+21 |
| | | | | | |||||
| | * | | | migrate admin:jobs:index to static bundle | Mike Greiling | 2018-02-16 | 1 | -4/+2 |
| | | | | | |||||
| | * | | | migrate dashboard:todos:index to static bundle | Mike Greiling | 2018-02-16 | 2 | -6/+1 |
| | | | | | |||||
| | * | | | migrate groups:merge_requests to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate groups:issues to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate dashboard:merge_requests to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate dashboard:issues to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate dashboard:milestones:show to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | migrate groups:milestones:show to static bundle | Mike Greiling | 2018-02-16 | 2 | -6/+1 |
| | | | | | |||||
| | * | | | migrate projects:milestones:show to static bundle | Mike Greiling | 2018-02-16 | 2 | -7/+2 |
| | | | | |