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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooks	Stan Hu	2018-01-09	1	-0/+5
\| \| \| \|	Closes #41739
*	Fixing bug related to wiki last version	Francisco Javier López	2018-01-09	1	-0/+5
\|
*	Merge branch 'changes-dropdown-ellipsis' into 'master'	Sean McGivern	2018-01-09	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
\| *	Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsis	Phil Hughes	2018-01-09	1	-0/+5
\| \| \| \| \| \| \| \|	Closes #41561
* \|	Add option to disable commit stats to commit API	Francisco Javier López	2018-01-09	1	-0/+5
\| \|
* \|	Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'	Douwe Maan	2018-01-09	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
\| * \|	Adds changelog for backport of authorized_keys DB lookup from EEjej/backport-authorized-keys-to-ce	James Edwards-Jones	2018-01-08	1	-0/+5
\| \| \|
* \| \|	Fixing re-ordering of an issue when dragging it to the bottom a long issue ↵	David Kuri	2018-01-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	list in the board
* \| \|	Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logs	Stan Hu	2018-01-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will enable admins to identify who actually made the API request. Relates to #36960
* \| \|	Merge branch 'fix/dashboard-projects-nav-links-height' into 'master'	Filipa Lacerda	2018-01-08	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dashboard projects nav links height See merge request gitlab-org/gitlab-ce!16204
\| * \| \|	Fix dashboard projects nav links height	George Tsiolis	2018-01-03	1	-0/+5
\| \| \| \|
* \| \| \|	Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'	Annabel Dunstone Gray	2018-01-08	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Substitute ui_charcoal theme deprecated by GitLab Theme (10.0) with ui_indigo Closes #41744 See merge request gitlab-org/gitlab-ce!16271
\| * \| \| \|	Substitute deprecated ui_charcoal with new default ui_indigo	Takuya Noguchi	2018-01-07	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '28260-fix-pages-custom-domain-url' into 'master'	Grzegorz Bizon	2018-01-08	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix wrong output protocol pattern when adding custom domain to Pages" Closes #28260 See merge request gitlab-org/gitlab-ce!16279
\| * \| \| \| \|	Generate HTTP URLs for custom Pages domains when appropriate	Nick Thomas	2018-01-08	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2018-01-08	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master' Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes Closes #40418 See merge request gitlab-org/gitlab-ce!15589
\| * \| \| \| \| \|	Fix change log	Shinya Maeda	2018-01-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog	Shinya Maeda	2018-01-08	1	-0/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '41754-update-scss-lint-to-0-56-0' into 'master'	Rémy Coutable	2018-01-08	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade scss-lint to 0.56.0 Closes #41754 See merge request gitlab-org/gitlab-ce!16278
\| * \| \| \| \| \|	Update scss-lint to 0.56.0	Takuya Noguchi	2018-01-08	1	-0/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'delay-background-migrations' into 'master'	Rémy Coutable	2018-01-08	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run background migrations with a minimum interval Closes #41624 See merge request gitlab-org/gitlab-ce!16230
\| * \| \| \| \| \|	Run background migrations with a minimum intervaldelay-background-migrations	Yorick Peterse	2018-01-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a minimum interval to BackgroundMigrationWorker, ensuring background migrations of the same class only run once every 5 minutes. This prevents a thundering herd problem where scheduled migrations all run at once due to their delays having been expired (e.g. as the result of a queue being paused for a long time). If a job was recently executed it's rescheduled with a delay that equals the remaining time of the job's lease. This means that if the lease expires in two minutes we only need to wait two minutes, instead of five. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/41624
* \| \| \| \| \| \|	Merge branch '40549-render-emoj-in-groups-overview' into 'master'	Sean McGivern	2018-01-08	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "No Rendering of emoji's in Group-Overview after update" Closes #40549 See merge request gitlab-org/gitlab-ce!16098
\| * \| \| \| \| \| \|	Rendering of emoji's in Group-Overview	Jacopo	2017-12-24	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows rendering of emoji's in the Group Overview.
* \| \| \| \| \| \| \|	Resolve "Add graph value to hover"	Mike Greiling	2018-01-08	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix slash commands dropdown description	Maurizio De Santis	2018-01-08	1	-0/+5
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	disables the shortcut to the issue boards when issues are disabled	Christiaan Van den Poel	2018-01-08	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵	Douwe Maan	2018-01-08	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198
\| * \| \| \| \| \|	Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-import	Tiago Botelho	2018-01-06	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-01-07	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master' Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled" Closes #39957 and #41410 See merge request gitlab-org/gitlab-ce!15665
\| * \| \| \| \| \| \|	Add CHANGELOG entry	Matija Čupić	2018-01-06	1	-0/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'	Kamil Trzciński	2018-01-07	1	-0/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix restoring associations with import/export Closes #41646 See merge request gitlab-org/gitlab-ce!16221
\| * \| \| \| \| \|	Merge branch 'master' into fix/gb/fix-import-export-restoring-associations	Grzegorz Bizon	2018-01-06	22	-0/+113
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (114 commits)
\| * \| \| \| \| \| \|	Add changelog entry for import/export associations fix	Grzegorz Bizon	2018-01-05	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '41249-clearing-the-cache' into 'master'	Kamil Trzciński	2018-01-06	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clearing the cache" Closes #41249 See merge request gitlab-org/gitlab-ce!16067
\| * \| \| \| \| \| \|	Merge branch 'master' into 41249-clearing-the-cache	Matija Čupić	2018-01-05	12	-0/+61
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add CHANGELOG entry	Matija Čupić	2018-01-05	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_40500' into 'master'	Sean McGivern	2018-01-05	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve filtering issues by label performance Closes #40500 and #37143 See merge request gitlab-org/gitlab-ce!16136
\| * \| \| \| \| \| \| \|	Improve filtering issues by label performanceissue_40500	Felipe Artur	2018-01-05	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Use --left-right and --max-count for counting diverging commits	Lin Jen-Shin (godfat)	2018-01-05	1	-0/+6
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issues/40986/get-participants-from-issues-mr-api' into 'master'	Rémy Coutable	2018-01-05	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: get participants from merge_requests & issues Closes #40986 See merge request gitlab-org/gitlab-ce!16187
\| * \| \| \| \| \| \| \|	API: get participants from merge_requests & issues	Brent Greeff	2018-01-05	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ac-autodevopfix-kubectl-version' into 'master'	Kamil Trzciński	2018-01-05	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Create secrets failed for Auto DevOps with latest stable of kubectl" Closes #41376 See merge request gitlab-org/gitlab-ce!16218
\| * \| \| \| \| \| \| \|	Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-version	Alessio Caiazza	2018-01-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit extracts `kubectl`, `helm` and `codeclimate` versions as CI variables. `kubectl` changes from latest stable version to `1.8.6`, the other two are just extracted in order to be easily updated; now we can also test tool upgrades overriding CI secret variables.
* \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-rebase' into 'master'	Filipa Lacerda	2018-01-05	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
\| * \| \| \| \| \| \| \|	Backport 'Rebase' feature from EE to CEjprovazn-rebase	Jan Provaznik	2018-01-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* \| \| \| \| \| \| \| \|	Merge branch 'api-domains-expose-project_id' into 'master'	Dmitriy Zaporozhets	2018-01-05	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
\| * \| \| \| \| \| \| \| \|	Expose project_id on /api/v4/pages/domains	Luc Didry	2018-01-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-redis-rack' into 'master'	Rémy Coutable	2018-01-05	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update redis-rack to 2.0.4 See merge request gitlab-org/gitlab-ce!16251
\| * \| \| \| \| \| \| \| \| \|	Update redis-rack to 2.0.4update-redis-rack	Yorick Peterse	2018-01-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Up until version 2.0.3 redis-rack included a "rake" binary that would overwrite/hijack the one provided by Rake itself. Unfortunately the binary provided by redis-rack would produce errors in many cases. See https://github.com/redis-store/redis-rack/pull/34 for more info.