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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Setup Phabricator import	Bob Van Landuyt	2019-05-31	53	-60/+1746
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This sets up all the basics for importing Phabricator tasks into GitLab issues. To import all tasks from a Phabricator instance into GitLab, we'll import all of them into a new project that will have its repository disabled. The import is hooked into a regular ProjectImport setup, but similar to the GitHub parallel importer takes care of all the imports itself. In this iteration, we're importing each page of tasks in a separate sidekiq job. The first thing we do when requesting a new page of tasks is schedule the next page to be imported. But to avoid deadlocks, we only allow a single job per worker type to run at the same time. For now we're only importing basic Issue information, this should be extended to richer information.
*	Merge branch 'generate-letsencrypt-private_key-on-the-fly' into 'master'	Stan Hu	2019-05-31	5	-30/+79
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Generate letsencrypt private key on the fly Closes #62452 See merge request gitlab-org/gitlab-ce!28855
\| *	Generate lets_encrypt_private_key on the fly	Vladimir Shushlin	2019-05-31	5	-30/+79
\|/ \| \| \| \| \| \| \| \|	Remove migration generating lets encrypt key Don't generate private_key if database is readonly For reference: This reverts commit 988a7f70489b99383b95e9f271a2caf6bb5b3a44. This reverts commit 21acbe531592d55caf0e5b8716a3b551dafd6233.
*	Merge branch 'docs-qa-doc-consolidation' into 'master'	Dan Davison	2019-05-31	10	-27/+38
\|\ \| \| \| \| \| \| \| \|	Consolidate documentation written for e2e tests under dev docs See merge request gitlab-org/gitlab-ce!28572
\| *	Consolidate documentation written for e2e tests under dev docs	ddavison	2019-05-30	10	-27/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the documentation was separated. If we want to bake quality into the product, how better than to include everything we use directly in the development documentation Signed-off-by: ddavison <ddavison@gitlab.com> Fix broken internal doc link Move documentation for page objects to the e2e section
* \|	Merge branch 'faster_qa_auto_devops' into 'master'	Dan Davison	2019-05-31	1	-0/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use Dockerfile flow for QA Auto DevOps See merge request gitlab-org/gitlab-ce!28648
\| * \|	Use Dockerfile flow for QA Auto DevOpsfaster_qa_auto_devops	Thong Kuah	2019-05-31	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This results in 40MB images vs 400MB images which is faster to upload and download. This does mean we lose the default herokuish QA coverage but we should have adequate coverage in https://gitlab.com/gitlab-org/cluster-integration/auto-build-image/ now. Triva: herokuish is bigger because it's base image is based on `ubuntu`.
* \| \|	Merge branch 'qa-fix-api-client-login-validation' into 'master'	Dan Davison	2019-05-31	1	-6/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Allow login validation before creating personal access token See merge request gitlab-org/gitlab-ce!28960
\| * \| \|	Allow login validation before blockqa-fix-api-client-login-validation	Mark Lapierre	2019-05-31	1	-6/+3
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes a block so that the login page is validated before the block, while the login page is still present, instead of after it when the login page is long gone
* \| \|	Merge branch 'winh-issue-boards-addList-sort' into 'master'	Mike Greiling	2019-05-30	4	-17/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort by position in issue boards store addList() See merge request gitlab-org/gitlab-ce!28827
\| * \| \|	Sort by position in issue boards store addList()	Winnie Hellmann	2019-05-30	4	-17/+25
\|/ / /
* \| \|	Merge branch 'upgrade-core-js' into 'master'	Mike Greiling	2019-05-30	4	-20/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade core-js to v3.1.3 and enable URL polyfill See merge request gitlab-org/gitlab-ce!28909
\| * \| \|	Upgrade core-js and add URL polyfillupgrade-core-js	Paul Gascou-Vaillancourt	2019-05-30	4	-20/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Upgraded core-js from v2.x to v3.1.3 - Updated core-js import statements - Enabled URL polyfill
* \| \| \|	Merge branch 'if-10137-ee_specific_lines_projects_api' into 'master'	Robert Speicher	2019-05-30	4	-60/+90
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of Move EE specific lines in API::Projects See merge request gitlab-org/gitlab-ce!28596
\| * \| \| \|	CE port of Move EE specific lines in API::Projects	Imre Farkas	2019-05-30	4	-60/+90
\|/ / / /
* \| \| \|	Merge branch 'if-10137-ee_specific_lines_settings_api' into 'master'	Robert Speicher	2019-05-30	3	-47/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of Move EE specific lines in API::Settings See merge request gitlab-org/gitlab-ce!28708
\| * \| \| \|	CE port of Move EE specific lines in API::Settings	Imre Farkas	2019-05-30	3	-47/+25
\|/ / / /
* \| \| \|	Merge branch '609120-ref-link' into 'master'	Mayra Cabrera	2019-05-30	3	-1/+12
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes ref being displayed as raw HTML Closes #60912 See merge request gitlab-org/gitlab-ce!28823
\| * \| \|	Fixes ref being displayed as raw HTML609120-ref-link	Filipa Lacerda	2019-05-30	3	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ref to the branch was being displayed as raw HTML in the Pipelines page
* \| \| \|	Merge branch 'i18n-pgp_ssh_keys-of-user-profile' into 'master'12-0-stable-prepare-rc1	Clement Ho	2019-05-30	12	-36/+100
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings of PGP Keys and SSH Keys page in user profile See merge request gitlab-org/gitlab-ce!28653
\| * \| \| \|	Externalize strings of PGP Keys and SSH Keys page in user profile	antony liu	2019-05-30	12	-36/+100
\|/ / / /
* \| \| \|	Merge branch '47846-position-is-off-when-visiting-files-with-anchors' into ↵	Mike Greiling	2019-05-30	2	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Position is off when visiting files with anchors" Closes #47846 See merge request gitlab-org/gitlab-ce!28913
\| * \| \| \|	Add offset adjust to fix line position	Justin Boyson	2019-05-30	2	-0/+15
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added offset adjustment for diff file header and version menus container divs. This should make the linked line be visible.
* \| \| \|	Merge branch ↵	Mike Greiling	2019-05-30	1	-8/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ee-7672-geo-remove-deprecated-wikis_count-and-repositories_count-fields-from-the-public-api-geo' into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13025 See merge request gitlab-org/gitlab-ce!28701
\| * \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13025ee-7672-geo-remove-deprecated-wikis_count-and-repositories_count-fields-from-the-public-api-geo	Valery Sizov	2019-05-29	1	-8/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'extract-danger-roulette' into 'master'	Nick Thomas	2019-05-30	11	-186/+231
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make single codebase roulette respect OOO status See merge request gitlab-org/gitlab-ce!28877
\| * \| \| \| \|	Use roulette for single codebase rouletteextract-danger-roulette	Lin Jen-Shin	2019-05-30	2	-12/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Extract roulette to its own module	Lin Jen-Shin	2019-05-30	9	-174/+212
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So it's more modular and extensible
* \| \| \| \| \|	Merge branch '62485-label-weights' into 'master'	Annabel Dunstone Gray	2019-05-30	2	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Give all labels bold weight Closes #62485 See merge request gitlab-org/gitlab-ce!28895
\| * \| \| \| \| \|	Give all labels bold weight62485-label-weights	Jarek Ostrowski	2019-05-29	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Form check labels get normal weight Add changelog
* \| \| \| \| \| \|	Merge branch '11848-fix-broken-master-ce' into 'master'	Dmitriy Zaporozhets	2019-05-30	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Fix test with hard coded id See merge request gitlab-org/gitlab-ce!28933
\| * \| \| \| \| \| \|	Fix test with hard coded id	Heinrich Lee Yu	2019-05-30	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-label-color-titles' into 'master'	Sean McGivern	2019-05-30	2	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent capitalization in label colors See merge request gitlab-org/gitlab-ce!28922
\| * \| \| \| \| \| \| \|	Fix inconsistent capitalization in label colors	Heinrich Lee Yu	2019-05-30	2	-6/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'tkuah-codeowners' into 'master'	Mayra Cabrera	2019-05-30	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add @tkuah to CODEOWNERS Closes gitlab-com/www-gitlab-com#3357 See merge request gitlab-org/gitlab-ce!28917
\| * \| \| \| \| \| \| \|	Add @tkuah to CODEOWNERStkuah-codeowners	Thong Kuah	2019-05-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-sort alphabetically
* \| \| \| \| \| \| \| \|	Merge branch '61323-snippet-copy-icon-button-is-misaligned' into 'master'	Annabel Dunstone Gray	2019-05-30	7	-7/+14
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Snippet icon button is misaligned" Closes #61323 See merge request gitlab-org/gitlab-ce!28522
\| * \| \| \| \| \| \| \|	Get copy to clipboard button aligned within snippet header	Marcel van Remmerden	2019-05-30	7	-7/+14
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '9121-sort-relative-position' into 'master'docs/create-table-driven-standards	Sean McGivern	2019-05-30	8	-33/+105
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support sorting issues using `relative_position` Closes #62178 See merge request gitlab-org/gitlab-ce!28566
\| * \| \| \| \| \| \| \|	Check for manual_sorting feature flag9121-sort-relative-position	Brett Walker	2019-05-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow issues to be sorted by relative_position	Brett Walker	2019-05-28	8	-33/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- adding a "Manual" option to the dropdown - show 100 issues list when manually sorting
* \| \| \| \| \| \| \| \|	Merge branch 'referenced-labels' into 'master'	Kushal Pandya	2019-05-30	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add referenced-commands in no overflow list See merge request gitlab-org/gitlab-ce!28858
\| * \| \| \| \| \| \| \|	Add referenced-commands in no overflow listreferenced-labels	Rajat Jain	2019-05-29	2	-1/+7
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'i18n-active_sessions-in-user-profile' into 'master'	Kushal Pandya	2019-05-30	4	-7/+28
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings of active sessions page in user profile See merge request gitlab-org/gitlab-ce!28590
\| * \| \| \| \| \| \|	Externalize strings of active sessions page in user profile	antony liu	2019-05-30	4	-7/+28
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'issue/11040' into 'master'	Filipa Lacerda	2019-05-30	2	-0/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of EE change in `app/views/search/_form.html.haml` See merge request gitlab-org/gitlab-ce!28883
\| * \| \| \| \| \| \|	Backport of EE change in `app/views/search/_form.html.haml`	Michel Engelen	2019-05-30	2	-0/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'	Filipa Lacerda	2019-05-30	25	-54/+150
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show Pipeline IID everywhere Pipeline ID is shown. Closes #57414 See merge request gitlab-org/gitlab-ce!26853
\| * \| \| \| \| \| \|	Add Pipeline IID to views	Mike Scott	2019-05-30	25	-54/+150
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add Pipeline IID to MR's * Add Pipeline IID to commit box * Add Pipeline IID to builds page * Add Pipeline IID to job sidebar * Add Pipeline IID to header on view pipeline pages * Add changelog entry * Update tests
* \| \| \| \| \| \|	Merge branch '6104-ee-ce-difference' into 'master'	Filipa Lacerda	2019-05-30	3	-2/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unified repository/show.html for CE and EE Closes gitlab-ee#6104 See merge request gitlab-org/gitlab-ce!28868