summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Restore memoization to base query and add a batch base query methodTiago Botelho2018-02-286-11/+16
| | | | | | | | |
| * | | | | | | | Add BatchLoader as a way to refactor the base stage codeTiago Botelho2018-02-288-45/+49
| | | | | | | | |
| * | | | | | | | Refactor CycleAnalytics base stage class and modelTiago Botelho2018-02-283-8/+10
| | | | | | | | |
| * | | | | | | | Adds get all medians to Cycle Analytics modelTiago Botelho2018-02-286-15/+102
| | | | | | | | |
* | | | | | | | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-0127-43/+494
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052
| * | | | | | | | Fix feature spec Clusters Applications (#17052)42643-persist-external-ip-of-ingress-controller-gkeDylan Griffith2018-03-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to actually wait for the "Install" button to be enabled before clicking it otherwise we have a race condition where it sometimes works. Also change the `expect(page.find(...))` to `expect(page).to have_css` as this is prefered to avoid race conditions
| * | | | | | | | Add "to clipboard" to the copy text in the clipboard buttonFilipa Lacerda2018-02-281-1/+1
| | | | | | | | |
| * | | | | | | | Remove redundant code and increase delay for ↵Dylan Griffith2018-02-254-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClusterWaitForIngressIpAddressWorker (#42643)
| * | | | | | | | Increase lease timeout for CheckIngressIpAddressService to reduce polling ↵Dylan Griffith2018-02-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frequency (#42643)
| * | | | | | | | Remove extra space from stringFilipa Lacerda2018-02-231-1/+1
| | | | | | | | |
| * | | | | | | | Fix spec/features/projects/clusters/applications_spec.rb (#42643)>Dylan Griffith2018-02-231-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the flakiness by using `expect(page).to have_css(..., exact_text: '')` instead of `expect(page.find(...).text).to eq('')` since the former will wait until the text has this value while the latter will only wait for the element to exist then test its text straight away which introduces a race condition if the element is already there with a previous text value. This test was failing locally most of the time because of this other way of asserting.
| * | | | | | | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeDylan Griffith2018-02-23571-5042/+7670
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix clusters_controller_spec (#42643)Dylan Griffith2018-02-231-2/+2
| | | | | | | | | |
| * | | | | | | | | Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changesDylan Griffith2018-02-238-126/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#42643)
| * | | | | | | | | Improve grammar in IP sentenceFilipa Lacerda2018-02-221-2/+3
| | | | | | | | | |
| * | | | | | | | | Use value attribute in ip inputFilipa Lacerda2018-02-223-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes double quoted string
| * | | | | | | | | Update changelog 42643-persist-external-ip-of-ingress-controller-gke to be ↵Dylan Griffith2018-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature not bug fix
| * | | | | | | | | Changes after reviewFilipa Lacerda2018-02-214-13/+15
| | | | | | | | | |
| * | | | | | | | | Update merge_request in changelog (#17052)Dylan Griffith2018-02-211-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix eslint errorFilipa Lacerda2018-02-201-2/+4
| | | | | | | | | |
| * | | | | | | | | Remove extra commas from templatesFilipa Lacerda2018-02-201-8/+4
| | | | | | | | | |
| * | | | | | | | | Remove duplicate IDFilipa Lacerda2018-02-203-8/+7
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeFilipa Lacerda2018-02-2099-4091/+592
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Docs: Pages - clean up articles Only use features for events Put all event metrics exposed to prometheus behind a feature flag Add version which LFS lock was introduced Remove unecessary validate: true from belongs_to :project fix broken specs remove common_d3 bundle remove graphs_show webpack bundle Chart.html.haml refactor Remove extraneous tests from Issues API spec [GH Import] Create an empty wiki if wiki import failed Resolve "group request membership mail with too long list of "To:"" Add changelog entry Fix single digit value clipping specify date format Increase feature flag cache TTL to one hour Convert Gitaly commit parent IDs to array as early as possible Clarify changelog for squash encoding fix Avoid slow File Lock checks when not used Fix squash rebase not working when diff contained encoded data ...
| * | | | | | | | | | Adds missing links, uses value instead of placeholder in input field and ↵Filipa Lacerda2018-02-208-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly sets the ip key
| * | | | | | | | | | Update feature spec for kubernetes applications ingress IP address (#42643)Dylan Griffith2018-02-201-0/+10
| | | | | | | | | | |
| * | | | | | | | | | Schedule Ingress IP address fetch from K8s after clusters page load (#42643)Dylan Griffith2018-02-205-0/+53
| | | | | | | | | | |
| * | | | | | | | | | Refactor ingress IP address waiting code (#42643)Dylan Griffith2018-02-2010-92/+141
| | | | | | | | | | |
| * | | | | | | | | | Adds support to render the IP address in the application ingress rowFilipa Lacerda2018-02-195-27/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates components to use a slot to allow to reuse the clipboard button Adds tests
| * | | | | | | | | | [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-02-19224-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 ...
| * | | | | | | | | | | Fix rubocop warning (#42643)Dylan Griffith2018-02-161-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Ensure CheckIngressIpAddressService obtains exclusive lease per ingress ↵Dylan Griffith2018-02-152-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller (#42643)
| * | | | | | | | | | | Persist external IP of ingress controller created for GKE (#42643)Dylan Griffith2018-02-1514-2/+229
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'zj-licensee-key' into 'master'43548-update-language-about-usage-ping-in-admin-settings-and-docsSean McGivern2018-03-014-9/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client implementation for Licensee#key See merge request gitlab-org/gitlab-ce!17449
| * | | | | | | | | | | | Client implementation for Licensee#keyZeger-Jan van de Weg2018-03-014-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the migration as tracked in: gitlab-org/gitaly#1026
* | | | | | | | | | | | | Merge branch '30665-add-email-button-to-new-issue-by-email' into 'master'Clement Ho2018-03-012-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Have mailto: link in "Email a new issue to this project"" Closes #30665 See merge request gitlab-org/gitlab-ce!17401
| * | | | | | | | | | | | | Add mail_to button new issue by email modal30665-add-email-button-to-new-issue-by-emailIslam Wazery2018-02-282-1/+12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'remove-vue-mr-webpack' into 'master'Mike Greiling2018-03-011-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary chunks from common_vue See merge request gitlab-org/gitlab-ce!17460
| * | | | | | | | | | | | | Remove unnecessary chunks from common_vueClement Ho2018-03-011-11/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fj-28141-redirection-loop' into 'master'Douwe Maan2018-03-013-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the two factor check when the user sets a new password Closes #28141 See merge request gitlab-org/gitlab-ce!17457
| * | | | | | | | | | | | | Removing the two factor check when the user sets a new passwordFrancisco Javier López2018-03-013-0/+16
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'dz-namespace-id-not-null' into 'master'Yorick Peterse2018-03-017-8/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make project#namespace_id not null Closes #26052 See merge request gitlab-org/gitlab-ce!17448
| * | | | | | | | | | | | | Update specs to respect Project#namespace_id not null constraintDmitriy Zaporozhets2018-03-014-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | Add changelog for namespace_id not null migrationDmitriy Zaporozhets2018-03-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | Update schema with latest migrationDmitriy Zaporozhets2018-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | Make project#namespace_id not nulldz-namespace-id-not-nullDmitriy Zaporozhets2018-03-011-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | Merge branch '42434-allow-commits-endpoint-to-work-over-all-commits' into ↵Douwe Maan2018-03-018-34/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Allow API method /projects/:id/repository/commits to work over all commits" Closes #42434 See merge request gitlab-org/gitlab-ce!17182
| * | | | | | | | | | | | | | Add specs42434-allow-commits-endpoint-to-work-over-all-commitsTiago Botelho2018-03-017-27/+104
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | API method /projects/:id/repository/commits now works over every commitTiago Botelho2018-02-233-14/+33
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'feature/gb/pipeline-variable-expressions' into 'master'Kamil Trzciński2018-03-0119-0/+748
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline variables expressions See merge request gitlab-org/gitlab-ce!17261
| * | | | | | | | | | | | | | | Make max tokens in expressions lexer a class-level attributeGrzegorz Bizon2018-03-012-7/+8
| | | | | | | | | | | | | | | |