summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add docs for persistent `ActiveRecord::PendingMigrationError` with Springdocs/spring-db-migration-errorEric Eastwood2018-03-012-0/+41
|
* Merge branch 'winh-fix-vuex-docs' into 'master'Filipa Lacerda2018-03-011-4/+4
|\ | | | | | | | | Small fixes in Vuex docs See merge request gitlab-org/gitlab-ce!17471
| * Small fixes in Vuex docswinh-fix-vuex-docsWinnie Hellmann2018-03-011-4/+4
| |
* | Merge branch 'remove-u2f-bundle' into 'master'Jacob Schatz2018-03-0114-99/+118
|\ \ | | | | | | | | | | | | Remove u2f webpack bundle See merge request gitlab-org/gitlab-ce!17435
| * | Remove u2f webpack bundleMike Greiling2018-03-0114-99/+118
|/ /
* | Merge branch 'remove-blob-viewer-bundles' into 'master'Phil Hughes2018-03-0113-49/+42
|\ \ | | | | | | | | | | | | Remove blob viewer bundles See merge request gitlab-org/gitlab-ce!17446
| * | remove common_vue CommonsChunk configMike Greiling2018-03-011-14/+0
| | |
| * | migrate stl_viewer to dynamic importMike Greiling2018-03-014-6/+5
| | |
| * | migrate sketch_viewer to dynamic importMike Greiling2018-03-014-7/+5
| | |
| * | migrate pdf_viewer to dynamic importMike Greiling2018-03-014-7/+4
| | |
| * | migrate notebook_viewer to dynamic importMike Greiling2018-03-014-7/+4
| | |
| * | migrate balsamiq_viewer to dynamic importMike Greiling2018-03-015-8/+24
| | |
* | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-0173-1911/+1944
|\ \ \ | | | | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
| * | | Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-2873-1911/+1944
| | | |
* | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master'Douwe Maan2018-03-0128-134/+498
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793
| * | | | Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-pingTiago Botelho2018-03-0122-123/+242
| | | | |
| * | | | Refactors median code to work with both single and multiple projectsTiago Botelho2018-02-2813-88/+236
| | | | |
| * | | | Restrict cycle analytics usage data to instances that use postgres onlyTiago Botelho2018-02-285-10/+9
| | | | |
| * | | | 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
| | | | | | | |