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

	Commit message (Collapse)	Author	Age	Files	Lines
*	ES: sync with EE328-versioned-search-ee	Mark Chao	2019-08-12	2	-39/+65
\|
*	Merge branch 'qa-unquarantine-diff-patch-test' into 'master'	Ramya Authappan	2019-08-12	1	-2/+1
\|\ \| \| \| \| \| \| \| \|	Remove test from quarantine See merge request gitlab-org/gitlab-ce!31704
\| *	Remove test from quarantineqa-unquarantine-diff-patch-test	Mark Lapierre	2019-08-12	1	-2/+1
\| \|
* \|	Merge branch 'docs-chatops-version' into 'master'	Evan Read	2019-08-12	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix introduced section in chatops doc See merge request gitlab-org/gitlab-ce!31655
\| * \|	Fix introduced section in chatops doc	Marcel Amirault	2019-08-12	1	-5/+5
\|/ /
* \|	Merge branch 'docs-mdl-rules-update-2' into 'master'	Evan Read	2019-08-12	18	-250/+186
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add more rules to markdown lint check See merge request gitlab-org/gitlab-ce!31652
\| * \|	Add more rules to markdown lint check	Marcel Amirault	2019-08-12	18	-250/+186
\|/ / \| \| \| \| \| \| \| \| \| \|	Adds MD010 (Hard tabs), MD012 (blank lines), MD029 (ordered list prefix), MD030 (spaces after list markers), and fixes remaining docs that were failing these tests
* \|	Merge branch 'bump-nokogiri-1.10.4' into 'master'	Stan Hu	2019-08-12	4	-7/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bump nokogiri to 1.10.4 See merge request gitlab-org/gitlab-ce!31701
\| * \|	Bump nokogiri to 1.10.4bump-nokogiri-1.10.4	Thong Kuah	2019-08-12	4	-7/+7
\| \|/ \| \| \| \| \| \| \| \|	This pulls in fix for CVE-2019-5477, where usage of Nokogiri::CSS::Tokenizer#load_file leads to potential command injection.
* \|	Merge branch 'valexieva-subgroups-CA' into 'master'	Evan Read	2019-08-12	1	-1/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	adding subgroups to docs See merge request gitlab-org/gitlab-ce!31570
\| *	adding subgroups to docs	Virjinia Alexieva	2019-08-12	1	-1/+2
\|/
*	Merge branch '13439-fix-broken-karma-test-on-ee-side' into 'master'	Paul Slaughter	2019-08-11	2	-5/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken master: Update karma for new expansion cell markup Closes gitlab-ee#13439 See merge request gitlab-org/gitlab-ce!31694
\| *	Update karma for new expansion cell markup	André Luís	2019-08-11	2	-5/+13
\|/ \| \| \| \| \|	Also cleans up spec by: - Add missing `afterEach ... $destroy` - Add missing `done` call when `$nextTick` was used
*	Merge branch 'emilie-master-patch-19291' into 'master'	Achilleas Pipinellis	2019-08-11	1	-2/+3
\|\ \| \| \| \| \| \| \| \|	Make clearer that memory team is working to reduce memory requirement See merge request gitlab-org/gitlab-ce!31647
\| *	Update note regarding memory team	Emilie Schario	2019-08-11	1	-2/+3
\|/ \| \| \| \|	Make clearer that the memory team is working to reduce the memory requirement
*	Merge branch 'sh-update-ffi' into 'master'	Ash McKenzie	2019-08-10	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update ffi gem to 1.11.1 See merge request gitlab-org/gitlab-ce!31686
\| *	Update ffi gem to 1.11.1sh-update-ffi	Stan Hu	2019-08-10	1	-1/+1
\|/ \| \| \| \| \| \| \|	This reduces duplication on Omnibus GitLab and saves about ~8 MB of disk space. Full list of changes: https://github.com/ffi/ffi/blob/master/CHANGELOG.md
*	Merge branch 'ce-docker_image_replication_node_status' into 'master'	Douglas Barbosa Alexandre	2019-08-10	3	-0/+32
\|\ \| \| \| \| \| \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14943 See merge request gitlab-org/gitlab-ce!31406
\| *	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14943ce-docker_image_replication_node_status	Valery Sizov	2019-08-07	3	-0/+32
\| \| \| \| \| \| \| \|	Docker Registry Replication
* \|	Merge branch '58035-expand-mr-diff' into 'master'	Mike Greiling	2019-08-10	27	-130/+780
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Incrementally expand merge request diffs in both direction" Closes #58035 See merge request gitlab-org/gitlab-ce!30927
\| * \|	Replace ... with new expansion options	Samantha Ming	2019-08-10	27	-130/+780
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- expand upwards - expand downwards - expand all in both inline and parallel views
* \|	Merge branch 'id-mr-widget-etag-caching' into 'master'	Douwe Maan	2019-08-09	19	-453/+560
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Split MR widget into etag-cached and non-cached serializers See merge request gitlab-org/gitlab-ce!31354
\| * \|	Split MR widget into cached and non-cached serializers	Igor	2019-08-09	19	-453/+560
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Splits auto-refreshing of MR widget into 2 requests: - the one which uses etag-caching and invalidates the fields on change - the one without caching The idea is to gradually move all the fields to etag-cached endpoint
* \|	Merge branch 'spec-differences' into 'master'	Robert Speicher	2019-08-09	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE code for OAuth applications spec See merge request gitlab-org/gitlab-ce!31670
\| * \|	Backport EE code for OAuth applications specspec-differences	Yorick Peterse	2019-08-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This spec used a different title for a spec in EE, while CE duplicated the same title. This ensures that CE uses the EE version.
* \| \|	Merge branch 'issue_58494' into 'master'	Robert Speicher	2019-08-09	3	-1/+29
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent rewritting plain links as embedded Closes #58494 See merge request gitlab-org/gitlab-ce!31489
\| * \| \|	Prevent rewritting plain links as embeddedissue_58494	Felipe Artur	2019-08-07	3	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents rewritting plain image/video links as embedded when moving issues.
* \| \| \|	Merge branch 'scripts-differences' into 'master'	Robert Speicher	2019-08-09	1	-126/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed duplicate functions from utils.sh Closes gitlab-ee#13336 See merge request gitlab-org/gitlab-ce!31671
\| * \| \| \|	Removed duplicate functions from utils.shscripts-differences	Yorick Peterse	2019-08-09	1	-126/+0
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change was made in EE in MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14802, but this was not backported to CE.
* \| \| \|	Merge branch 'tr-remove-embed-metrics-flag' into 'master'	Robert Speicher	2019-08-09	9	-65/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove embed metrics feature flag See merge request gitlab-org/gitlab-ce!31106
\| * \| \| \|	Remove gfm_embed_metrics flag from BE	Tristan Read	2019-08-09	9	-65/+8
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the feature flag that controls whether metrics dashboard urls unfurl the metrics dashboard charts.
* \| \| \|	Merge branch 'lm-download-csv-of-charts-from-metrics-dashboard' into 'master'	Clement Ho	2019-08-09	10	-7/+83
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to download chart CSV from metrics dashboard Closes #60733 See merge request gitlab-org/gitlab-ce!30760
\| * \| \| \|	Adds button to download metrics data as csv	Laura Montemayor	2019-08-09	10	-7/+83
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds a temporary button to be able to download the Prometheus metrics from charts to CSV format.
* \| \| \|	Merge branch 'sh-bump-gitlab-workhorse-8.8.0' into 'master'	Douglas Barbosa Alexandre	2019-08-09	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GitLab Workhorse to v8.8.0 See merge request gitlab-org/gitlab-ce!31676
\| * \| \| \|	Bump GitLab Workhorse to v8.8.0	Stan Hu	2019-08-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This sanitizes some log messages to be consistent with CE. Full list of changes: https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG
* \| \| \| \|	Merge branch ↵	Bob Van Landuyt	2019-08-09	3	-5/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'13208-epicissue-has-an-unexpected-default-relative-position-ce' into 'master' [CE] Remove default `relative_position` from `epic_issues` See merge request gitlab-org/gitlab-ce!31514
\| * \| \| \| \|	Remove default relative_position value13208-epicissue-has-an-unexpected-default-relative-position-ce	Heinrich Lee Yu	2019-08-09	3	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes `epic_issues` consistent with other tables using our `RelativePositioning` class
* \| \| \| \| \|	Merge branch '59712-resolve-the-search-problem-issue' into 'master'	Paul Slaughter	2019-08-09	10	-28/+196
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search loses branch" Closes #59712 See merge request gitlab-org/gitlab-ce!28282
\| * \| \| \| \| \|	Add repo-refs control for search page	minghuan lei	2019-08-09	10	-28/+196
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- only in blobs result
* \| \| \| \| \|	Merge branch 'revert-d61dab91' into 'master'	Bob Van Landuyt	2019-08-09	7	-93/+29
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '65152-selective-highlight' into 'master'" See merge request gitlab-org/gitlab-ce!31643
\| * \| \| \| \|	Revert "Merge branch '65152-selective-highlight' into 'master'"revert-d61dab91	Patrick Bajao	2019-08-09	7	-93/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !31361
* \| \| \| \| \|	Merge branch 'fix-job-log-formatting' into 'master'	Filipa Lacerda	2019-08-09	2	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix job log where spans were displayed in block Closes #65686 See merge request gitlab-org/gitlab-ce!31674
\| * \| \| \| \| \|	Fix job log where spans were displayed in blockfix-job-log-formatting	Fabio Pitino	2019-08-09	2	-5/+5
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a temporary, not ideal, solution but it fixes the main issue that the customer are complaining about, which is that color changes are broken down in several lines which makes the log not readable.
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2019-08-09	3	-102/+138
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'64730-metrics-dashboard-menu-is-cramped-with-new-features-enabled' into 'master' Improve layout of dropdowns in the metrics dashboard page Closes #64730 See merge request gitlab-org/gitlab-ce!31239
\| * \| \| \| \| \|	Improve layout of dropdowns in metrics page	Miguel Rincon	2019-08-09	3	-102/+138
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure layout works on xs and sm screens Add check in case buttons are not present Apply Prettier to file Remove unused class and div, reduce margins
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2019-08-09	4	-5/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62137-add-tooltip-to-improve-clarity-of-detached-label-state-in-the-merge-request-pipeline' into 'master' Resolve "Add tooltip to improve clarity of "detached" label/state in the merge request pipeline" Closes #62137 See merge request gitlab-org/gitlab-ce!31626
\| * \| \| \| \| \|	Resolve "Add tooltip to improve clarity of "detached" label/state in the ↵	Nick Kipling	2019-08-09	4	-5/+14
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge request pipeline"
* \| \| \| \| \|	Merge branch 'app-differences' into 'master'	Rémy Coutable	2019-08-09	1	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE changes to Members::BaseService See merge request gitlab-org/gitlab-ce!31581
\| * \| \| \| \| \|	Backport EE changes to Members::BaseServiceapp-differences	Yorick Peterse	2019-08-08	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE made some small changes to this class, but these changes were not backported to CE.
* \| \| \| \| \| \|	Merge branch 'lib-differences' into 'master'	Rémy Coutable	2019-08-09	2	-1/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve EE differences in the lib/ directory See merge request gitlab-org/gitlab-ce!31582