Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksums | Nick Thomas | 2018-03-02 | 16 | -60/+378 |
| | |||||
* | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master' | Sean McGivern | 2018-03-02 | 12 | -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-batch | Ahmad Sherif | 2018-03-01 | 12 | -101/+193 |
| | | | | | | | | Closes gitaly#1046 | ||||
* | | Merge branch 'jprovazn-ancestor-labels' into 'master' | Grzegorz Bizon | 2018-03-02 | 5 | -7/+70 |
|\ \ | | | | | | | | | | | | | Support additional LabelsFinder parameters for group labels See merge request gitlab-org/gitlab-ce!17447 | ||||
| * | | Allow to include also descendant group labels | Jan Provaznik | 2018-03-02 | 4 | -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 labels | Jan Provaznik | 2018-03-02 | 3 | -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 Bizon | 2018-03-02 | 4 | -3/+11 |
|\ \ \ | |/ / |/| | | | | | | | | Allow CI/CD Jobs being grouped on version strings See merge request gitlab-org/gitlab-ce!17455 | ||||
| * | | Update docs on grouping CI jobs | Zeger-Jan van de Weg | 2018-03-02 | 1 | -1/+2 |
| | | | |||||
| * | | Allow CI/CD Jobs being grouped on version strings | Zeger-Jan van de Weg | 2018-03-01 | 3 | -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 Hu | 2018-03-02 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Update documentation WRT to request parameters See merge request gitlab-org/gitlab-ce!17469 | ||||
| * | | | Update documentation WRT to request parametersan/log-documentation | Andrew Newdigate | 2018-03-01 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch '32831-single-deploy-of-runner-in-k8s-cluster' into 'master' | Kamil Trzciński | 2018-03-01 | 35 | -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 cluster | Mayra Cabrera | 2018-03-01 | 35 | -411/+758 |
|/ / / / | |||||
* | | | | Merge branch 'webpack-registry' into 'master' | Jacob Schatz | 2018-03-01 | 4 | -4/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove registry list webpack entry point See merge request gitlab-org/gitlab-ce!17459 | ||||
| * | | | | Remove registry list webpack entry point | Clement Ho | 2018-03-01 | 4 | -4/+5 |
|/ / / / | |||||
* | | | | Merge branch 'sh-remove-trailing-lines' into 'master' | Jacob Schatz | 2018-03-01 | 2 | -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 conflict | Stan Hu | 2018-03-01 | 2 | -2/+0 |
|/ / / / | |||||
* | | | | Merge branch 'bvl-add-missing-externalized-strings' into 'master' | Douwe Maan | 2018-03-01 | 1 | -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-strings | Bob Van Landuyt | 2018-03-01 | 1 | -26/+148 |
| | | | | | |||||
* | | | | | Merge branch 'winh-fix-vuex-docs' into 'master' | Filipa Lacerda | 2018-03-01 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Small fixes in Vuex docs See merge request gitlab-org/gitlab-ce!17471 | ||||
| * | | | | | Small fixes in Vuex docswinh-fix-vuex-docs | Winnie Hellmann | 2018-03-01 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'remove-u2f-bundle' into 'master' | Jacob Schatz | 2018-03-01 | 14 | -99/+118 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove u2f webpack bundle See merge request gitlab-org/gitlab-ce!17435 | ||||
| * | | | | | Remove u2f webpack bundle | Mike Greiling | 2018-03-01 | 14 | -99/+118 |
|/ / / / / | |||||
* | | | | | Merge branch 'remove-blob-viewer-bundles' into 'master' | Phil Hughes | 2018-03-01 | 13 | -49/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove blob viewer bundles See merge request gitlab-org/gitlab-ce!17446 | ||||
| * | | | | | remove common_vue CommonsChunk config | Mike Greiling | 2018-03-01 | 1 | -14/+0 |
| | | | | | | |||||
| * | | | | | migrate stl_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -6/+5 |
| | | | | | | |||||
| * | | | | | migrate sketch_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -7/+5 |
| | | | | | | |||||
| * | | | | | migrate pdf_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -7/+4 |
| | | | | | | |||||
| * | | | | | migrate notebook_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -7/+4 |
| | | | | | | |||||
| * | | | | | migrate balsamiq_viewer to dynamic import | Mike Greiling | 2018-03-01 | 5 | -8/+24 |
| | | | | | | |||||
* | | | | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master' | Douwe Maan | 2018-03-01 | 73 | -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/auth | Horatiu Eugen Vlad | 2018-02-28 | 73 | -1911/+1944 |
| | | | | | | | |||||
* | | | | | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master' | Douwe Maan | 2018-03-01 | 28 | -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-ping | Tiago Botelho | 2018-03-01 | 22 | -123/+242 |
| | | | | | | | | |||||
| * | | | | | | | Refactors median code to work with both single and multiple projects | Tiago Botelho | 2018-02-28 | 13 | -88/+236 |
| | | | | | | | | |||||
| * | | | | | | | Restrict cycle analytics usage data to instances that use postgres only | Tiago Botelho | 2018-02-28 | 5 | -10/+9 |
| | | | | | | | | |||||
| * | | | | | | | Restore memoization to base query and add a batch base query method | Tiago Botelho | 2018-02-28 | 6 | -11/+16 |
| | | | | | | | | |||||
| * | | | | | | | Add BatchLoader as a way to refactor the base stage code | Tiago Botelho | 2018-02-28 | 8 | -45/+49 |
| | | | | | | | | |||||
| * | | | | | | | Refactor CycleAnalytics base stage class and model | Tiago Botelho | 2018-02-28 | 3 | -8/+10 |
| | | | | | | | | |||||
| * | | | | | | | Adds get all medians to Cycle Analytics model | Tiago Botelho | 2018-02-28 | 6 | -15/+102 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master' | Kamil Trzciński | 2018-03-01 | 27 | -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-gke | Dylan Griffith | 2018-03-01 | 1 | -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 button | Filipa Lacerda | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Remove redundant code and increase delay for ↵ | Dylan Griffith | 2018-02-25 | 4 | -10/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClusterWaitForIngressIpAddressWorker (#42643) | ||||
| * | | | | | | | Increase lease timeout for CheckIngressIpAddressService to reduce polling ↵ | Dylan Griffith | 2018-02-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frequency (#42643) | ||||
| * | | | | | | | Remove extra space from string | Filipa Lacerda | 2018-02-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix spec/features/projects/clusters/applications_spec.rb (#42643)> | Dylan Griffith | 2018-02-23 | 1 | -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-gke | Dylan Griffith | 2018-02-23 | 571 | -5042/+7670 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix clusters_controller_spec (#42643) | Dylan Griffith | 2018-02-23 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changes | Dylan Griffith | 2018-02-23 | 8 | -126/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#42643) |