summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add support for :all option to {count,find}_commitsfeature/add-support-for-all-option-in-count-find-commitsAhmad Sherif2018-03-026-185/+193
|
* Merge branch ↵Sean McGivern2018-03-021-7/+7
|\ | | | | | | | | | | | | | | | | '43548-update-language-about-usage-ping-in-admin-settings-and-docs' into 'master' Resolve "Update language about usage ping in admin settings" Closes #43548 See merge request gitlab-org/gitlab-ce!17468
| * Clarify usage ping wording in admin areaSean McGivern2018-03-021-7/+7
| |
* | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'Sean McGivern2018-03-0212-101/+193
|\ \ | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456
| * | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-0112-101/+193
| | | | | | | | | | | | Closes gitaly#1046
* | | Merge branch 'jprovazn-ancestor-labels' into 'master'Grzegorz Bizon2018-03-025-7/+70
|\ \ \ | | | | | | | | | | | | | | | | Support additional LabelsFinder parameters for group labels See merge request gitlab-org/gitlab-ce!17447
| * | | Allow to include also descendant group labelsJan Provaznik2018-03-024-11/+39
| | | | | | | | | | | | | | | | | | | | | | | | Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542
| * | | Support additional LabelsFinder parameters for group labelsJan Provaznik2018-03-023-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels).
* | | | Merge branch 'zj-version-string-grouping-ci' into 'master'Grzegorz Bizon2018-03-024-3/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Allow CI/CD Jobs being grouped on version strings See merge request gitlab-org/gitlab-ce!17455
| * | | Update docs on grouping CI jobsZeger-Jan van de Weg2018-03-021-1/+2
| | | |
| * | | Allow CI/CD Jobs being grouped on version stringsZeger-Jan van de Weg2018-03-013-2/+9
| | | | | | | | | | | | | | | | | | | | This makes grouping on version number available. In general I'd like to group based on MAJOR.MINOR version numbers for Gitaly.
* | | | Merge branch 'an/log-documentation' into 'master'Stan Hu2018-03-021-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update documentation WRT to request parameters See merge request gitlab-org/gitlab-ce!17469
| * | | | Update documentation WRT to request parametersan/log-documentationAndrew Newdigate2018-03-011-1/+2
| | | | |
* | | | | Merge branch '32831-single-deploy-of-runner-in-k8s-cluster' into 'master'Kamil Trzciński2018-03-0135-411/+758
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster Closes #32831 See merge request gitlab-org/gitlab-ce!17134
| * | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes clusterMayra Cabrera2018-03-0135-411/+758
|/ / / / /
* | | | | Merge branch 'webpack-registry' into 'master'Jacob Schatz2018-03-014-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove registry list webpack entry point See merge request gitlab-org/gitlab-ce!17459
| * | | | | Remove registry list webpack entry pointClement Ho2018-03-014-4/+5
|/ / / / /
* | | | | Merge branch 'sh-remove-trailing-lines' into 'master'Jacob Schatz2018-03-012-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing newline that was causing an EE conflict See merge request gitlab-org/gitlab-ce!17465
| * | | | | Remove trailing newline that was causing an EE conflictStan Hu2018-03-012-2/+0
|/ / / / /
* | | | | Merge branch 'bvl-add-missing-externalized-strings' into 'master'Douwe Maan2018-03-011-26/+148
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add some strings that were missing in gitlab.pot See merge request gitlab-org/gitlab-ce!17467
| * | | | | Add some strings that were missing in gitlab.potbvl-add-missing-externalized-stringsBob Van Landuyt2018-03-011-26/+148
| | | | | |
* | | | | | 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
| |\ \ \ \ \ \ \
View Lorry Controller Status