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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'an-dtracing-test-for-invalid-tracers' into 'master'	Kamil Trzciński	2019-01-18	1	-0/+5
\|\ \| \| \| \| \| \| \| \|	Avoid overwriting default jaeger values with nil See merge request gitlab-org/gitlab-ce!24482
\| *	Avoid overwriting default jaeger values with nil	Andrew Newdigate	2019-01-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	During the review process for adding opentracing factories, a bug was introduced which caused Jaeger to initialize an invalid tracer. The bug was due to use sending nil through as a kwarg when the Jaeger initializer used a non-nil default value. This is fairly insidious as, the tracer looks like a tracer, but, when methods are invoked, it throws `NoMethodError` errors. To ensure that this issue does not happen in future, the tests have been changed to ensure that the tracer works as expected. This could avoid problems in future when upgrading to newer versions of Jaeger.
* \|	Merge branch 'fix-runner-eternal-loop-when-update-job-result' into 'master'	Kamil Trzciński	2019-01-18	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix runner eternal loop when update job result Closes #56518 See merge request gitlab-org/gitlab-ce!24481
\| * \|	Fix runner eternal loop when update job result	Shinya Maeda	2019-01-18	1	-0/+5
\| \|/ \| \| \| \| \| \| \| \| \| \|	Add spec Add changelog
* \|	Merge branch 'diff-tree-collapse-directories' into 'master'	Filipa Lacerda	2019-01-18	1	-0/+5
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Collapses directory structure in merge request tree Closes #53069 See merge request gitlab-org/gitlab-ce!24392
\| *	Collapses directory structure in merge request tree	Phil Hughes	2019-01-15	1	-0/+5
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53069
* \|	Merge branch 'Projects--dropdown-is-misaligned-on-issue-boards-page' into ↵	Annabel Dunstone Gray	2019-01-17	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Projects dropdown is misaligned on issue boards page Closes #48682 and #54920 See merge request gitlab-org/gitlab-ce!24277
\| * \|	fix misaligned projects dropdown	Johann Hubert Sonntagbauer	2019-01-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* dropdown position * add empty state list overflow * avoid double scrollbars in project dropdown
* \| \|	Merge branch '26375-markdown-footnotes-not-working' into 'master'	Lin Jen-Shin	2019-01-17	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Markdown footnotes not working Closes #26375 See merge request gitlab-org/gitlab-ce!24168
\| * \| \|	Refactoring and addressing review comments	Brett Walker	2019-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and additional spec
\| * \| \|	Properly process footnotes in markdown	Brett Walker	2019-01-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All the ids and classes were stripped. Add them back in and make ids unique
* \| \| \|	Merge branch 'backup_restore_fix_issue_46891' into 'master'	Rémy Coutable	2019-01-17	1	-0/+5
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Modify file restore to rectify tar issue See merge request gitlab-org/gitlab-ce!24000
\| * \| \|	Added changelog entry	Jason Colyer	2019-01-16	1	-0/+5
\| \| \| \|
* \| \| \|	Merge branch 'cleanup-leagcy-artifact-migration' into 'master'	Andreas Brandl	2019-01-17	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup legacy artifact background migration Closes #46866 See merge request gitlab-org/gitlab-ce!24144
\| * \| \| \|	Cleanup legacy artifact background migration	Shinya Maeda	2019-01-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add migration and spec commit 3cc12e1268a6865f524d8fab1804f018312fdf5a Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Jan 8 19:34:31 2019 +0900 Add changelog to this change commit 5006fc96e38db514956a35f53ae8ee536548a2e9 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Jan 8 19:32:56 2019 +0900 Remove partial index from ci_builds artifact_file ok Update schema commit 3c956bdc02b195bc67d0327bf3748a631ea5466d Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Jan 7 21:41:27 2019 +0900 Add frozen_string_literal: true commit 8c827cd616890160e6e8908843403a6f20c03236 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Jan 7 21:40:06 2019 +0900 Set batch size 100 commit aeee559777d3bdeadfd2b9bb61d460f2dc1fa8a6 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Jan 4 18:33:05 2019 +0900 Cleanup legacy artifact background migration
* \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2019-01-17	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42769-remove-expansion-hover-animation-from-status-icon-buttons' into 'master' Resolve "Remove expansion hover animation from status icon buttons" Closes #42769 See merge request gitlab-org/gitlab-ce!24268
\| * \| \| \| \|	Remove animation from pipeline status icon buttons	Nathan Friend	2019-01-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The expansion hover animation caused a number of layout headaches; this commit removes the animation and replaces them with hover/active/focus styles. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/42769
* \| \| \| \| \|	Merge branch '47988-improve-milestone-queries-with-subq' into 'master'	Andreas Brandl	2019-01-17	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve MilestonesFinder to accept project and group relations Closes #47988 See merge request gitlab-org/gitlab-ce!24325
\| * \| \| \| \| \|	Fix MilestonesFinder to pass relations to scope	Heinrich Lee Yu	2019-01-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of querying relations into ids we just pass them to the model scope because the scope supports it now. Also changes other calls to `Milestone.for_projects_and_groups`
* \| \| \| \| \| \|	Show CI artifacts size with 3 significant digits	Vladimir Shushlin	2019-01-17	1	-0/+6
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'an-opentracing-factory' into 'master'	Kamil Trzciński	2019-01-17	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conditionally initialize the global opentracing tracer See merge request gitlab-org/gitlab-ce!24186
\| * \| \| \| \| \|	Conditionally initialize the global opentracing tracer	Andrew Newdigate	2019-01-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
* \| \| \| \| \| \|	Merge branch 'gitaly-update-1.13.0' into 'master'	Sean McGivern	2019-01-17	1	-0/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to 1.13.0 See merge request gitlab-org/gitlab-ce!24429
\| * \| \| \| \| \|	Add changelog for Gitaly upgrade	Andrew Newdigate	2019-01-17	1	-0/+5
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Added support for custom hosts/domains	Aaron Walker	2019-01-17	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '52363-modifies-environment-scope-field-on-cluster-page' into ↵	Stan Hu	2019-01-17	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Changes UI on environment scope on clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24376
\| * \| \| \| \|	Changes environment scope UI on clusters page	Mayra Cabrera	2019-01-15	1	-0/+5
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modifies clusters form to display a disabled text field for environment scope. This changes is needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
* \| \| \| \|	Update CHANGELOG.md for 11.6.5	GitLab Release Tools Bot	2019-01-17	5	-25/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2019-01-16	1	-0/+5
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'security-2770-verify-bundle-import-files' into 'master'	Yorick Peterse	2019-01-16	1	-0/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Validate bundle files before unpacking them Closes #2770 See merge request gitlab/gitlabhq!2772
\| \| * \| \| \| \|	Validate bundle files before unpacking them	Nick Thomas	2019-01-10	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update changelog entry	George Tsiolis	2019-01-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18425
* \| \| \| \| \| \|	Merge branch 'add-badge-count-to-projects-and-groups' into 'master'	Lin Jen-Shin	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add badge count to projects Closes #29798 See merge request gitlab-org/gitlab-ce!18425
\| * \| \| \| \| \|	Add badge count to projects and groups	George Tsiolis	2019-01-15	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'an-gilab-process-name' into 'master'	Kamil Trzciński	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract process_name from GitLab::Sentry See merge request gitlab-org/gitlab-ce!24422
\| * \| \| \| \| \| \|	Extract process_name from GitLab::Sentry	Andrew Newdigate	2019-01-16	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab::Sentry has a program_context method to determine whether a Sentry exception occurred in Sidekiq or rails. Since we will need similar functionality for distributed tracing, this change extracts the program_context method into GitLab.process_name for more general consumption.
* \| \| \| \| \| \| \|	Merge branch 'features/document-graphicsmagick-source-installation' into ↵	Douwe Maan	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Document graphicsmagick installation for source installation Closes #56322 See merge request gitlab-org/gitlab-ce!24404
\| * \| \| \| \| \| \| \|	doc graphicsmagick installation for source install	Alexis Reigel	2019-01-15	1	-0/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Resolve "In Merge Request diff screen, master is not a hyperlink"	Natalia Tepluhina	2019-01-16	1	-0/+5
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ac-pages-subgroups' into 'master'	Nick Thomas	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Gitlab-Pages for subgroups See merge request gitlab-org/gitlab-ce!23505
\| * \| \| \| \| \| \|	Enable Gitlab-Pages for subgroups	Alessio Caiazza	2019-01-14	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Pages supports projects hosted under a subgroup, but not subgroup websites. That means that only the highest-level group supports i.e.: You created a group for your engineering department called `engineering`, a subgroup for all your documentation websites called `docs`,and a project within this subgroup is called `workflows`. Your project URL is `https://gitlab.com/engineering/docs/workflows/`. Once you enable GitLab Pages for this project, the site will live under `https://engineering.gitlab.io/docs/workflows`.
* \| \| \| \| \| \| \|	Merge branch 'shared_with_group_path' into 'master'	Nick Thomas	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add group ful path to project's shared_with_groups See merge request gitlab-org/gitlab-ce!24052
\| * \| \| \| \| \| \| \|	Add group full path to project's shared_with_groups	Mathieu Parent	2019-01-15	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-feature-gate-set-project-path' into 'master'	Kamil Trzciński	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow setting of feature gates per project See merge request gitlab-org/gitlab-ce!24184
\| * \| \| \| \| \| \| \| \|	Allow setting of feature gates per project	Zeger-Jan van de Weg	2019-01-14	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For features the feature gates are sometimes projects, not groups or users. For example for git object pools: https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/5872 This commit allows for setting feature group gates based on projects, by its path as that seems most convenient.
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-sidekiq-cron' into 'master'	Kamil Trzciński	2019-01-16	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sidekiq-cron 0.6.0 -> 1.0 See merge request gitlab-org/gitlab-ce!24235
\| * \| \| \| \| \| \| \| \| \|	Adopt Fugit to replace Rufus::Scheduler	Lin Jen-Shin	2019-01-15	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-403-page-is-rendered-but-404-is-the-response' into 'master'	Lin Jen-Shin	2019-01-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show the correct error page when access is denied Closes #55110 See merge request gitlab-org/gitlab-ce!23932
\| * \| \| \| \| \| \| \| \| \| \|	Show the correct error page when access is denied	Luke Bennett	2019-01-15	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	API: Fix default branch protection setting for Admin API	Robert Schilling	2019-01-15	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|