delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve project merge request settingsce-proj-settings-ok-mr-settings-only	Luke Bennett	2019-04-07	6	-36/+77
\| \| \| \|	Prioritize and simplify project settings content.
*	Merge branch 'sh-git-gc-after-initial-fetch' into 'master'	Michael Kozono	2019-04-07	3	-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-fetch	Stan Hu	2019-04-07	3	-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ński	2019-04-07	7	-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-caching	Stan Hu	2019-04-06	7	-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 Kozono	2019-04-07	5	-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 client	Peter Leitzen	2019-04-07	5	-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 Pandya	2019-04-07	2	-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-boards	Dmitriy Zaporozhets	2019-04-05	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch '_acet-related-mrs-widget-rewrite' into 'master'	Kushal Pandya	2019-04-07	24	-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-rewrite	Fatih Acet	2019-04-05	24	-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ński	2019-04-06	3	-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.yml	Tiger Watson	2019-04-06	3	-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 Hu	2019-04-06	3	-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-data	Heinrich Lee Yu	2019-04-06	3	-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 Greiling	2019-04-06	52	-320/+1516
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add Knative metrics to Prometheus See merge request gitlab-org/gitlab-ce!24663
\| * \| \|	Add Knative metrics to Prometheus	Chris Baumbauer	2019-04-06	52	-320/+1516
\|/ / /
* \| \|	Merge branch 'master' into 'master'	Douglas Barbosa Alexandre	2019-04-05	4	-14/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change label of button "Create Pipeline" to "Run Pipeline" See merge request gitlab-org/gitlab-ce!26943
\| * \| \|	Changes button label to Run Pipeline	Jean	2019-04-05	4	-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 Greiling	2019-04-05	5	-34/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix truncation bug in pipeline dropdowns Closes #58712 and #57900 See merge request gitlab-org/gitlab-ce!26172
\| * \| \|	Initial pass for tooltip changes	Sarah Groff Hennigh-Palermo	2019-04-05	5	-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 Alexandre	2019-04-05	1	-7/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Geo: Remove Alternate URL See merge request gitlab-org/gitlab-ce!27074
\| * \| \|	Port of mk/remove-alternate-url from EE	Michael Kozono	2019-04-05	1	-7/+0
\| \| \| \|
* \| \| \|	Merge branch ↵	Clement Ho	2019-04-05	8	-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
\| * \| \| \|	Document getTimeDifferenceMinutes usage31368-support-different-time-windows-for-performance-dashboard	Jose Vargas	2019-04-04	3	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added a finally clause to the getGraphsDataWithTime promise
\| * \| \| \|	Changed the feature flag usage	Jose Vargas	2019-04-04	5	-34/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order for the dashboard component not to fail, the feature flag is now required by default
\| * \| \| \|	Created `getTimeDiff` utility function	Jose Vargas	2019-04-04	6	-41/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated i18n strings and changed the monitoring service graph data params
\| * \| \| \|	Update translation files	Jose Vargas	2019-04-04	2	-1/+4
\| \| \| \| \|
\| * \| \| \|	Add feature flag	Jose Vargas	2019-04-04	4	-14/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added relevant tests that make use of a stubbed feature flag, prettified files
\| * \| \| \|	Modify the service to support the extra parameters	Jose Vargas	2019-04-04	4	-4/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the logic to allow the start and end dates to be created
\| * \| \| \|	Add support for time windows for the performance dashbooards	Jose Vargas	2019-04-04	4	-16/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The performance dashboards will now display the data from a set amount of time windows that are defined on a constants file
* \| \| \| \|	Merge branch '52258-labels-with-long-names-overflow-on-metrics-dashboard' ↵	Mike Greiling	2019-04-05	7	-23/+54
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Labels with long names overflow on metrics dashboard" Closes #52258 See merge request gitlab-org/gitlab-ce!26775
\| * \| \| \| \|	Wrap long chart tooltip series label names	Adriel Santiago	2019-04-05	7	-23/+54
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves an issue where long series label names overflow the popover chart tooltip container
* \| \| \| \|	Merge branch 'ce-improve-admin-licence-page-rest-fe' into 'master'	Mike Greiling	2019-04-05	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE FE Simplify admin instance licenses page Closes gitlab-ee#7054 See merge request gitlab-org/gitlab-ce!26439
\| * \| \| \| \|	Port "Simplify admin instance licenses page"ce-improve-admin-licence-page-rest-fe	Luke Bennett	2019-03-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ports CE changes to include a license app scss variable and a jest import alias.
* \| \| \| \| \|	Merge branch 'sh-fix-realtime-changes-with-reserved-words' into 'master'	Douglas Barbosa Alexandre	2019-04-05	3	-11/+35
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix real-time updates for projects that contain a reserved word Closes #60113 See merge request gitlab-org/gitlab-ce!27060
\| * \| \| \| \| \|	Fix real-time updates for projects that contain a reserved word	Stan Hu	2019-04-05	3	-11/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Projects that included reserved words (e.g. test-create) would fail to generate a proper ETag key because of the name. To fix this, we add forward slashes to match the exact name so that /test-create doesn't get matched, but /create does. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60113
* \| \| \| \| \| \|	Merge branch 'ce-10546-fix-epic-depth-validation' into 'master'	Douglas Barbosa Alexandre	2019-04-05	2	-10/+92
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE-port] Fix Epic depth validation See merge request gitlab-org/gitlab-ce!26390
\| * \| \| \| \| \| \|	Prevent infinite loops in ObjectHierarchyce-10546-fix-epic-depth-validation	Heinrich Lee Yu	2019-04-05	1	-4/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adds max_descendants_depth to ObjectHierarchy	Heinrich Lee Yu	2019-04-05	2	-10/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE-port of 10546-fix-epic-depth-validation
* \| \| \| \| \| \| \|	Merge branch 'minimized-multiple-queries-ce' into 'master'60094-clean-up-diff-file-header-css	Clement Ho	2019-04-05	7	-21/+74
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9707 to CE See merge request gitlab-org/gitlab-ce!25758
\| * \| \| \| \| \| \|	Support multiple queries per chart on metrics dash	Sarah Yasonik	2019-04-05	7	-21/+74
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding support for metrics alerts disabled multiple query support. To avoid a data model refactor, this enables the visual of multiple queries per chart on the front end, combining queries based on metric group, title, and y-axis label. This also adds support for adding and editing alerts based on the query selected rather than the single metric associated with the chart.
* \| \| \| \| \| \|	Merge branch '60068-avoid-null-domain-help-text' into 'master'	Clement Ho	2019-04-05	3	-6/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not display Ingress IP help text when there isn’t an Ingress IP assigned Closes #60068 See merge request gitlab-org/gitlab-ce!27057
\| * \| \| \| \| \| \|	Do not display ingress IP help text	Enrique Alcántara	2019-04-05	3	-6/+26
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if there isn’t an ingress IP assigned for the cluster yet
* \| \| \| \| \| \|	Merge branch 'revert-a827092b' into 'master'	Michael Kozono	2019-04-05	3	-8/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'" See merge request gitlab-org/gitlab-ce!27062
\| * \| \| \| \| \| \|	Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'"	Mayra Cabrera	2019-04-05	3	-8/+3
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26991
* \| \| \| \| \| \|	Merge branch 'duplicate-related-mrs' into 'master'	Michael Kozono	2019-04-05	3	-1/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicates from issue related merge requests See merge request gitlab-org/gitlab-ce!27067
\| * \| \| \| \| \| \|	Remove duplicates from issue related merge requestsduplicate-related-mrs	Alexandru Croitor	2019-04-05	3	-1/+18
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicates returned by Issues#related_merge_requests API that relies on ReferencedMergeRequestsService which returns 2 arrays one of related MRs and one of related MRs that close the issue(i.e. a subset of first one). We only need related MRs in this case so just pick the first array.
* \| \| \| \| \| \|	Merge branch '57364-improve-diff-nav-header' into 'master'	Fatih Acet	2019-04-05	14	-87/+179
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve diff nav header" See merge request gitlab-org/gitlab-ce!26557
\| * \| \| \| \| \| \|	Improve diff navigation header	Sam Bigelow	2019-04-05	14	-87/+179
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Compare versions header is full width except in the unified diff mode with no tree sidebar - Bar is always full width, but the content within stays centered when unified and no tree sidebar - File header is the same height as the "Compare versions header" - aligns with the design system grid guidelines => 56px - Diff file headers use a button group, switch icon order to open file externally being the last option, all buttons will become icon buttons (icon delivery by @dimitrieh) - If a file header becomes sticky no rounded corner/double border problem is visible anymore