summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Extract create merge request quick action spec59570-create-merge-request-quick-actionAlexandru Croitor2019-04-082-59/+56
|
* Merge branch '59570-wip-quick-action' into 'master'Sean McGivern2019-04-082-47/+44
|\ | | | | | | | | | | | | Extract w-i-p quick action to a shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26923
| * Extract wip quick action to a shared example59570-wip-quick-actionAlexandru Croitor2019-04-052-47/+44
| |
* | Merge branch '59570-duplicate-quick-action' into 'master'Sean McGivern2019-04-082-36/+35
|\ \ | | | | | | | | | | | | | | | | | | Extract duplicate quick action spec to a shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26912
| * | Extract duplicate quick action spec to a shared example59570-duplicate-quick-actionAlexandru Croitor2019-04-052-36/+35
| | |
* | | Merge branch '60006-add-touch-for-image-diff' into 'master'Phil Hughes2019-04-084-21/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add touch events for diff viewers Closes #60006 See merge request gitlab-org/gitlab-ce!26971
| * | | Fix touch event pageXftab2019-04-084-21/+57
|/ / / | | | | | | | | | | | | | | | | | | | | | Safari on iOS sort of figures out the right thing here, but other browsers need a specific touch to be referenced. This makes it work on Chrome and Firefox on Android, as well as Chrome DevTools mobile device view.
* | | Merge branch '58981-migrate-clusters-tests-to-jest' into 'master'Phil Hughes2019-04-087-41/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate clusters tests to jest Closes #58981 See merge request gitlab-org/gitlab-ce!27013
| * | | Migrate clusters tests to jestEnrique Alcántara2019-04-087-41/+62
|/ / / | | | | | | | | | | | | | | | Move cluster applications manager tests from karma to jest. Fixes some migration issues related with timeouts, and HTTP request expectations.
* | | Merge branch '60116-fix-button-wrapping' into 'master'Phil Hughes2019-04-082-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add `white-space: nowrap` to all buttons Closes #60116 See merge request gitlab-org/gitlab-ce!27069
| * | | Fix button text wrapping to next line60116-fix-button-wrappingAnnabel Dunstone Gray2019-04-052-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bootstrap removed white-space nowrap from buttons in v4.2.1, causing at least one bug, so this commit re-adds that style to all buttons
* | | | Merge branch 'sh-add-gitaly-ref-name-caching-tree-controller' into 'master'James Lopez2019-04-083-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable Gitaly FindCommit caching for TreeController See merge request gitlab-org/gitlab-ce!27100
| * | | | Enable Gitaly FindCommit caching for TreeControllersh-add-gitaly-ref-name-caching-tree-controllerStan Hu2019-04-073-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing /namespace/project/tree/master appears to query FindCommit 5 times with identical parameters. This reduces the number of FindCommit queries to 1.
* | | | | Merge branch 'ce-proj-settings-ok-mr-settings-only' into 'master'Fatih Acet2019-04-086-36/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Improve project merge request settings See merge request gitlab-org/gitlab-ce!26495
| * | | | | Improve project merge request settingsce-proj-settings-ok-mr-settings-onlyLuke Bennett2019-04-076-36/+77
| |/ / / / | | | | | | | | | | | | | | | Prioritize and simplify project settings content.
* | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Kushal Pandya2019-04-082-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.2.0 See merge request gitlab-org/gitlab-ce!27077
| * | | | | Update dependency @gitlab/ui to ^3.2.0Lukas 'Eipi' Eipert2019-04-052-5/+5
| | | | | |
* | | | | | Merge branch 'fix-karma-test-utils-master-overflow' into 'master'Kushal Pandya2019-04-0813-9/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Move serverless karma specs to jest Closes #60154 See merge request gitlab-org/gitlab-ce!27085
| * | | | | | Disable sync mode for serverless testsfix-karma-test-utils-master-overflowLuke Bennett2019-04-076-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync mode by default will soon be removed.
| * | | | | | Fix unmocked requests in serverless testsLuke Bennett2019-04-074-8/+16
| | | | | | |
| * | | | | | Move karma serverless tests to jest for isolationLuke Bennett2019-04-0713-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests cause master failures because of an overflow in vue-test-utils sync watcher setup.
* | | | | | | Merge branch 'docs-anchors-20-misc' into 'master'Evan Read2019-04-083-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix misc anchors See merge request gitlab-org/gitlab-ce!27088
| * | | | | | | Docs: Fix misc anchorsMarcel Amirault2019-04-083-4/+4
|/ / / / / / /
* | | | | | | Merge branch 'docs-anchors-19-environments' into 'master'Evan Read2019-04-087-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix anchors related to environments doc See merge request gitlab-org/gitlab-ce!27082
| * | | | | | | Docs: Fix anchors related to environments docMarcel Amirault2019-04-087-10/+10
|/ / / / / / /
* | | | | | | Merge branch 'patch-49' into 'master'Evan Read2019-04-071-4/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | docs: fix artifacts folder path, according to GitLab CE 11.8.2 See merge request gitlab-org/gitlab-ce!26536
| * | | | | | docs: fix artifacts folder path, according to GitLab CE 11.8.2 jk2K2019-03-251-4/+4
| | | | | | |
* | | | | | | Merge branch 'sh-git-gc-after-initial-fetch' into 'master'Michael Kozono2019-04-073-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub import: Run housekeeping after initial import See merge request gitlab-org/gitlab-ce!26600
| * | | | | | | GitHub import: Run housekeeping after initial importsh-git-gc-after-initial-fetchStan Hu2019-04-073-0/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After an initial fetch, the repository will have many loose objects and refs. Running a `git gc` will compact refs into `packed-refs` and objects into `.pack` files, which should make importing pull requests faster. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/59477
* | | | | | | Merge branch 'sh-improve-find-commit-caching' into 'master'Kamil Trzciński2019-04-077-4/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Expand FindCommit caching to blob and refs See merge request gitlab-org/gitlab-ce!27084
| * | | | | | Expand FindCommit caching to blob and refssh-improve-find-commit-cachingStan Hu2019-04-067-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables FindCommit caching to the following actions: * BlobController#show * RefsController#logs_tree It also improves caching in CommitsController since some duplicate requests were occuring inside the before_action definitions.
* | | | | | | Merge branch ↵Michael Kozono2019-04-075-20/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60149-nameerror-uninitialized-constant-sentry-client-sentryerror' into 'master' Handle possible HTTP exception for Sentry client Closes #60149 See merge request gitlab-org/gitlab-ce!27080
| * | | | | | | Handle possible HTTP exception for Sentry clientPeter Leitzen2019-04-075-20/+93
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior this commit exceptions raised during a HTTP request weren't caught by the Sentry client and were passed to the user. In addition the Sentry client tried to catch a non-existent error `Sentry::Client::SentryError`. Now, the Sentry client catches all possible errors coming from a HTTP request.
* | | | | | | Merge branch '59621-order-labels-alphabetically-in-issue-boards' into 'master'Kushal Pandya2019-04-072-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Order labels alphabetically in issue boards" Closes #59621 See merge request gitlab-org/gitlab-ce!26927
| * | | | | | | Sort labels alphabetically on issue board59621-order-labels-alphabetically-in-issue-boardsDmitriy Zaporozhets2019-04-052-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch '_acet-related-mrs-widget-rewrite' into 'master'Kushal Pandya2019-04-0724-70/+651
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite related MRs widget with Vue Closes #58926 and #57662 See merge request gitlab-org/gitlab-ce!27027
| * | | | | | | | Rewrite related MRs widget with Vue_acet-related-mrs-widget-rewriteFatih Acet2019-04-0524-70/+651
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR rewrites existing Related Merge Requests widget with Vue with reusing shared Related Issues components
* | | | | | | | | Merge branch '59997-restore-original-security-dast-gitlab-ci-yml-template' ↵Kamil Trzciński2019-04-063-62/+51
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Restore original Security/DAST.gitlab-ci.yml template Closes #59997 See merge request gitlab-org/gitlab-ce!26957
| * | | | | | | | Restore original Security/DAST.gitlab-ci.ymlTiger Watson2019-04-063-62/+51
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26520 for Security/DAST.gitlab-ci.yml.
* | | | | | | | Merge branch '58612-clean-up-notes-data' into 'master'Stan Hu2019-04-063-8/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up `noteable_id` for notes on commits Closes #58612 See merge request gitlab-org/gitlab-ce!26104
| * | | | | | | | Clean up `noteable_id` for notes on commits58612-clean-up-notes-dataHeinrich Lee Yu2019-04-063-8/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was incorrectly set by a bug in: https://gitlab.com/gitlab-org/gitlab-ce/issues/54924 Also adds a `batch_size` option to `update_column_in_batches`
* | | | | | | | | Merge branch 'knative-prometheus' into 'master'Mike Greiling2019-04-0652-320/+1516
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add Knative metrics to Prometheus See merge request gitlab-org/gitlab-ce!24663
| * | | | | | | | Add Knative metrics to PrometheusChris Baumbauer2019-04-0652-320/+1516
|/ / / / / / / /
* | | | | | | | Merge branch 'master' into 'master'Douglas Barbosa Alexandre2019-04-054-14/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change label of button "Create Pipeline" to "Run Pipeline" See merge request gitlab-org/gitlab-ce!26943
| * | | | | | | | Changes button label to Run PipelineJean2019-04-054-14/+16
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Button at projects/pipelines/new was 'Create pipeline' and was changed to 'Run Pipeline'
* | | | | | | | Merge branch '58712-truncate-names-in-pipeline' into 'master'Mike Greiling2019-04-055-34/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix truncation bug in pipeline dropdowns Closes #58712 and #57900 See merge request gitlab-org/gitlab-ce!26172
| * | | | | | | Initial pass for tooltip changesSarah Groff Hennigh-Palermo2019-04-055-34/+13
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes changes for truncation and combines the two related CSS classes. Applies new tooltip comp as close as possible to the span for testing.
* | | | | | | Merge branch 'mk/remove-alternate-url-ce' into 'master'Douglas Barbosa Alexandre2019-04-051-7/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] Geo: Remove Alternate URL See merge request gitlab-org/gitlab-ce!27074
| * | | | | | | Port of mk/remove-alternate-url from EEMichael Kozono2019-04-051-7/+0
| | | | | | | |
* | | | | | | | Merge branch ↵Clement Ho2019-04-058-27/+226
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31368-support-different-time-windows-for-performance-dashboard' into 'master' Resolve "Support different time windows for performance dashboard" Closes #31368 See merge request gitlab-org/gitlab-ce!26047