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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Restore changes from:restore-resource-user-via-browser-qa	Lin Jen-Shin	2018-11-06	1	-1/+1
\| \| \| \| \| \|	190afc62fb1e8753b2339d1d052b19a5da369c9e It was lost during a conflict resolution
*	Merge branch '18933-render-index-like-readme' into 'master'	Rémy Coutable	2018-11-06	5	-7/+48
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Render index.* like README.* when it's present in a directory Closes #18933 See merge request gitlab-org/gitlab-ce!22639
\| *	Remove extra whitespace on markup_helper.rb18933-render-index-like-readme	James Lopez	2018-11-02	1	-1/+1
\| \|
\| *	Refactor MarkupHelper to add INDEX plain filename	James Lopez	2018-11-02	1	-4/+9
\| \|
\| *	Add docs for README and index files	Achilleas Pipinellis	2018-11-02	1	-1/+27
\| \|
\| *	Test type of README file without extension	Achilleas Pipinellis	2018-11-02	2	-3/+4
\| \|
\| *	Correct MR number in changelog	Achilleas Pipinellis	2018-11-02	1	-1/+1
\| \|
\| *	Render index.* like README.* when it's present in a directory	Jakub Jirutka	2018-11-02	3	-2/+11
\| \| \| \| \| \| \| \|	Resolves #18933
* \|	Merge branch '34758-unique-environment-scope' into 'master'34758-group-level-kubernetes-cluster-configuration	Dmitriy Zaporozhets	2018-11-06	1	-6/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Sync `groups` and `group` to fix EE validation See merge request gitlab-org/gitlab-ce!22788
\| * \|	Sync `groups` and `group` to fix validation34758-unique-environment-scope	Thong Kuah	2018-11-03	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise adding to `groups` will cause validation (in EE) based on `group` to fail. This is consistent with how Clusters::Cluster#first_project. The alternative is to switch validation to use `groups` as well.
* \| \|	Merge branch 'sh-fix-issue-8040-ee' into 'master'	Phil Hughes	2018-11-06	2	-11/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix save button not activating when original setting started as null Closes gitlab-ee#8040 See merge request gitlab-org/gitlab-ce!22820
\| * \| \|	Fix save button not activating when original setting started as null	Stan Hu	2018-11-06	2	-11/+24
\|/ / /
* \| \|	Merge branch 'ce-fix_vuln_list_on_group_dashboard' into 'master'	Kamil Trzciński	2018-11-06	4	-0/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport generic methods to CE See merge request gitlab-org/gitlab-ce!22826
\| * \| \|	Backport generic methods to CEce-fix_vuln_list_on_group_dashboard	Olivier Gonzalez	2018-11-05	4	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to fetch all pipelines for every projects in a group and its subgroups. Allow to fetch the latest pipeline id for each projects of a group and its subgroups.
* \| \| \|	Merge branch 'dimitrieh-master-patch-39313' into 'master'	Rémy Coutable	2018-11-06	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes the way approvals are handled to the documentation Closes #52929 See merge request gitlab-org/gitlab-ce!22498
\| * \| \| \|	Includes the way approvals are handled to the documentation	Dimitrie Hoekstra	2018-11-06	1	-0/+6
\|/ / / /
* \| \| \|	Merge branch 'tc-fix-failing-awardable-spec' into 'master'	Douwe Maan	2018-11-06	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix failing master See merge request gitlab-org/gitlab-ce!22830
\| * \| \|	Don't care about order when getting awarded issues	Toon Claes	2018-11-06	1	-2/+2
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fixing failing master: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/116776474
* \| \|	Merge branch '53224-rename-to-resource-base-qa' into 'master'	Douglas Barbosa Alexandre	2018-11-05	85	-1615/+1601
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Rename QA::Factory to QA::Resource See merge request gitlab-org/gitlab-ce!22772
\| * \| \|	Rename QA::Factory to QA::Resource53224-rename-to-resource-base-qa	Lin Jen-Shin	2018-11-05	85	-1615/+1601
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Factory::Base -> Resource::Base, and therefore: * Factory::Resource::Project -> Resource::Project
* \| \| \|	Merge branch 'fix-codequality' into 'master'testing-review-app-password	Grzegorz Bizon	2018-11-05	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid artifact path for codequality See merge request gitlab-org/gitlab-ce!22816
\| * \| \| \|	Fix invalid artifact path for codequalityfix-codequality	Kamil Trzciński	2018-11-05	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '48239-performance-info-ref' into 'master'	Stan Hu	2018-11-05	4	-10/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance tuning on Projects::GitHttpController#info_refs Closes #48239 See merge request gitlab-org/gitlab-ce!22013
\| * \| \| \| \|	Make migration symmetric48239-performance-info-ref	Mark Chao	2018-11-05	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Combine two updates in one query	Mark Chao	2018-11-05	1	-9/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add index to speed up loading projects from DeployToken	Mark Chao	2018-11-05	2	-0/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Memorize project to avoid re-query	Mark Chao	2018-11-05	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \|	Merge branch '53362-allow-concurrency-in-puma' into 'master'	Stan Hu	2018-11-05	3	-1/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow concurrency when using Puma Closes #53362 See merge request gitlab-org/gitlab-ce!22751
\| * \| \| \| \| \|	Allow concurrency when using Puma	Andrew Newdigate	2018-11-05	3	-1/+8
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'gl-ui-tooltip-2' into 'master'	Filipa Lacerda	2018-11-05	5	-4/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitlab-ui's tooltip from global See merge request gitlab-org/gitlab-ce!22814
\| * \| \| \| \| \|	Remove gitlab-ui's tooltip from global	Clement Ho	2018-11-05	5	-4/+18
\|/ / / / / /
* \| \| \| \| \|	Merge branch '52925-scheduled-pipelines-ui-problems' into 'master'	Clement Ho	2018-11-05	3	-4/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline schedule style issues Closes #52925 See merge request gitlab-org/gitlab-ce!22758
\| * \| \| \| \| \|	Fix pipeline schedule style issues	Scott Hampton	2018-11-05	3	-4/+15
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'disallow-retry-of-old-builds' into 'master'	Grzegorz Bizon	2018-11-05	24	-38/+270
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow retry of old builds Closes #50939 See merge request gitlab-org/gitlab-ce!22538
\| * \| \| \| \|	Allow to make builds soft-archived.disallow-retry-of-old-builds	Kamil Trzciński	2018-11-05	24	-38/+270
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The soft-archived builds cannot be run after some deadline time. The intent is to aggressively recycle old builds after sometime.
* \| \| \| \|	Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master'	Sean McGivern	2018-11-05	5	-14/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove PersonalAccessTokensFinder#find_by method See merge request gitlab-org/gitlab-ce!22617
\| * \| \| \| \|	Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookup	Imre Farkas	2018-11-05	5	-14/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	find_by_token is overriden by TokenAuthenticatable which can be easily missed or confused with #find_by(:token) defined by ActiveRecord. First step for safer usage is to remove #find_by.
* \| \| \| \| \|	Merge branch '52300-pool-repositories' into 'master'	Sean McGivern	2018-11-05	13	-0/+177
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start tracking pool repositories Closes #38238 and #52300 See merge request gitlab-org/gitlab-ce!22482
\| * \| \| \| \| \|	Start tracking pool repositories	Nick Thomas	2018-11-05	9	-0/+80
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Start tracking shards in the database	Nick Thomas	2018-11-05	6	-0/+97
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-fix-issue-52176' into 'master'	Yorick Peterse	2018-11-05	3	-0/+36
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable replication lag check for Aurora PostgreSQL databases Closes #52176 See merge request gitlab-org/gitlab-ce!22786
\| * \| \| \| \| \| \|	Disable replication lag check for Aurora PostgreSQL databasessh-fix-issue-52176	Stan Hu	2018-11-03	3	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replication slots are not supported in Aurora. Attempting to check the lag results in the message: ``` ActiveRecord::StatementInvalid: PG::FeatureNotSupported: ERROR: Replication slots are currently not supported in Aurora : SELECT pg_xlog_location_diff(pg_current_xlog_insert_location(), restart_lsn)::... ``` To avoid breaking support for background migrations in Aurora, we just disable the check if we encounter this error. This change also now checks whether there are any replication slots present in the primary before checking the replication lag. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52176
* \| \| \| \| \| \| \|	Merge branch 'gt-update-project-and-group-labels-empty-state' into 'master'	Annabel Dunstone Gray	2018-11-05	5	-5/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update project and group labels empty state See merge request gitlab-org/gitlab-ce!22745
\| * \| \| \| \| \| \| \|	Remove empty state button margin on small viewports	George Tsiolis	2018-11-03	2	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update project and group labels empty state	George Tsiolis	2018-11-02	4	-5/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_51323' into 'master'	Phil Hughes	2018-11-05	21	-21/+158
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'only history' option to notes filter Closes #51323 See merge request gitlab-org/gitlab-ce!22544
\| * \| \| \| \| \| \| \|	Add 'only history' option to notes filter	Felipe Artur	2018-11-05	21	-21/+158
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'zj-bump-gitaly-0-128' into 'master'	Douwe Maan	2018-11-05	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Gitaly to 0.128.0 See merge request gitlab-org/gitlab-ce!22802
\| * \| \| \| \| \| \| \|	Bump Gitaly to 0.128.0	Zeger-Jan van de Weg	2018-11-05	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make sure GitLab will have the latest Gitaly, the version number has to be bumped here.
* \| \| \| \| \| \| \| \|	Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'	Tim Zallmann	2018-11-05	15	-92/+309
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the Play button for delayed jobs in environment page Closes #52129 See merge request gitlab-org/gitlab-ce!22106