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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Protect group overview usage ping w/ feature flag7048_usage_ping_for_security_dashboard_as_default_view_for_groups-ce	Victor Zagorodny	2019-02-12	2	-2/+10
\| \| \| \| \| \| \|	user_preferences key is includes into system usage data only if group_overview_security_dashboard feature flag is enabled; see https://gitlab.com/gitlab-org/gitlab-ee/issues/7048
*	Add user_preferences_usage to usage ping	Victor Zagorodny	2019-02-12	2	-1/+9
\|
*	Merge branch 'sh-terminate-pg-connections-on-setup' into 'master'	Rémy Coutable	2019-02-12	1	-0/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Kill all PostgreSQL connections for rake dev:setup Closes gitlab-development-kit#450 See merge request gitlab-org/gitlab-ce!24743
\| *	Move terminate_all_connections into setup Rake task	Stan Hu	2019-02-11	3	-35/+21
\| \|
\| *	Kill all PostgreSQL connections for rake dev:setup	Stan Hu	2019-02-11	3	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If there are any clients connected to the DB, PostgreSQL won't let you drop the database. It's possible that Sidekiq, Unicorn, or some other client will be hanging onto a connection, preventing the DROP DATABASE from working. To workaround this problem, this method cancels all the connections so that the db:reset command will work. Note that there's still a slight possibility a client connects after its connection is terminated. If this is an issue, we could solve it by revoking CONNECT access, but for now it seems this works. Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/450
* \|	Merge branch '47150-update-sshkey' into 'master'	Rémy Coutable	2019-02-12	3	-3/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sshkey to v2.0.0 Closes #47150 See merge request gitlab-org/gitlab-ce!25115
\| * \|	Update sshkey to v2.0.0	Nick Thomas	2019-02-11	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This release fixes a bug in handling certain ed25519 keys. For more details, see this GitHub issue: https://github.com/bensie/sshkey/issues/34
* \| \|	Merge branch 'qa-nightly-72-stablize-select-kind' into 'master'	Dan Davison	2019-02-12	5	-11/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stablize select_kind using retry_on_exception Closes gitlab-org/quality/nightly#72 See merge request gitlab-org/gitlab-ce!25027
\| * \| \|	Add back the :quarantine tag	Sanad Liaquat	2019-02-12	1	-1/+2
\| \| \| \|
\| * \| \|	Stablize select kind using retry_on_exceptionqa-nightly-72-stablize-select-kind	Sanad Liaquat	2019-02-08	6	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduces retry_on_exception and renames with_retry to retry_unti so its purpose is clear in presense of retry_on_exception.
* \| \| \|	Merge branch 'add-client-for-count-diverging-commits' into 'master'	Grzegorz Bizon	2019-02-12	10	-16/+155
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add client support for CountDivergingCommits rpc See merge request gitlab-org/gitlab-ce!24287
\| * \| \| \|	Adapt that diverging commits could be just one baradd-client-for-count-diverging-commits	Lin Jen-Shin	2019-02-11	7	-18/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactors the ui for diverging commits so that it's only a single bar instead of two separate bars
\| * \| \| \|	Add client support for count diverging commits	John Cai	2019-02-06	6	-4/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the client call for the gitaly rpc CountDivergingCommits fixing signature simplifying commit logic adding test for max-count refactoring tests
* \| \| \| \|	Merge branch 'jc-add-has-repository' into 'master'	Douglas Barbosa Alexandre	2019-02-12	2	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding convenience method to project model See merge request gitlab-org/gitlab-ce!25108
\| * \| \| \| \|	Adding convenience method to project model	John Cai	2019-02-11	2	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Evan Read	2019-02-12	1	-0/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57287-documentation-for-handling-more-complex-only-merge_requests-scenarios-is-sparse' into 'master' Docs for MR pipeline rule interactions Closes #57287 See merge request gitlab-org/gitlab-ce!24929
\| * \| \| \| \| \|	Small grammar fix	Evan Read	2019-02-12	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md57287-documentation-for-handling-more-complex-only-merge_requests-scenarios-is-sparse	Jason Lenny	2019-02-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename section header to be more clear	Jason Lenny	2019-02-05	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add new section describing usage in exclusion scenario	Jason Lenny	2019-02-05	1	-0/+43
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-security-harness-script' into 'master'	Robert Speicher	2019-02-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix security harness script See merge request gitlab-org/gitlab-ce!25050
\| * \| \| \| \| \| \|	Fix security harness scriptfix-security-harness-script	Felipe Artur	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"[[" Syntax is not supported on debian based systems.
* \| \| \| \| \| \| \|	Merge branch 'bw-review-feedback-task-list-toggle-service' into 'master'	Robert Speicher	2019-02-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address review comment for app/services/task_list_toggle_service.rb Closes #57413 See merge request gitlab-org/gitlab-ce!25013
\| * \| \| \| \| \| \|	Optimize the compare of the task linesbw-review-feedback-task-list-toggle-service	Brett Walker	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'bvl-port-translations-from-ee' into 'master'	Rémy Coutable	2019-02-11	42	-15302/+141195
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of EE translations See merge request gitlab-org/gitlab-ce!25100
\| * \| \| \| \| \| \| \|	Merge branch 'master-i18n' into 'master'	Rémy Coutable	2019-02-11	42	-15302/+141195
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Crowdin translations See merge request gitlab-org/gitlab-ee!9510
* \| \| \| \| \| \| \| \|	Merge branch 'docs-profile-html-output-example' into 'master'	Marcia Ramos	2019-02-11	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add HTML output example to profiling See merge request gitlab-org/gitlab-ce!25103
\| * \| \| \| \| \| \| \|	Add HTML output example to profiling	Drew Blessing	2019-02-11	1	-0/+10
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs/pages-compress' into 'master'	Marcia Ramos	2019-02-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change find flags to also work with Alpine Closes #57341 See merge request gitlab-org/gitlab-ce!25104
\| * \| \| \| \| \| \| \|	Change find flags to also work with Alpine	Achilleas Pipinellis	2019-02-11	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '57450-follow-up-from-api-group-labels' into 'master'	Achilleas Pipinellis	2019-02-11	1	-8/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Follow-up from "API group labels"" Closes #57450 See merge request gitlab-org/gitlab-ce!25070
\| * \| \| \| \| \| \| \|	Improve group labels API docs57450-follow-up-from-api-group-labels	Robert Schilling	2019-02-10	1	-8/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/refactor-update-guides' into 'master'	Marin Jankovski	2019-02-11	86	-17385/+709
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the upgrading from source docs Closes gitlab-org/release/framework#190 See merge request gitlab-org/gitlab-ce!25003
\| * \| \| \| \| \| \| \| \|	Use a single document for upgrading from CE to EE	Yorick Peterse	2019-02-11	2	-5/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the guides for upgrading from CE source to EE source so we no longer need separate documents for every version. This removes the need for release managers to create and update these documents, and allows developers to add these instructions as part of their code changes.
\| * \| \| \| \| \| \| \| \|	Refactor the upgrading from source docsdocs/refactor-update-guides	Yorick Peterse	2019-02-11	85	-17380/+572
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of requiring one separate document for every version (which is created by release managers), we now use a single document for both Community Edition and Enterprise Edition. This allows developers to add guidelines right away, instead of release managers having to determine what to add. Version specific upgrading instructions are placed in a separate section. This prevents instructions from lingering around for many versions should a developer forget to remove them. This also ensures that all instructions are kept in a single place, instead of being spread across different documents. A minor downside is that CE and EE guidelines now live in the same document, which could cause merge conflicts. Since we are working towards a single codebase, this should only be an issue until we merge the codebases together; something we expect to do in the coming months. This commit also removes all old upgrading instructions, but these can still be accessed using Git branch specific URLs (included in the updating README).
* \| \| \| \| \| \| \| \|	Merge branch 'docs-abuango-registry-selfsigned-certs' into 'master'	Tom Atkins	2019-02-11	1	-6/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update on using self-signed certs with registry See merge request gitlab-org/gitlab-ce!25086
\| * \| \| \| \| \| \| \| \|	Update container_registry.md add Troubleshooting sections	Tom Atkins	2019-02-11	1	-5/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update on using self-signed certs with registrydocs-abuango-registry-selfsigned-certs	Abubakar Siddiq Ango	2019-02-11	1	-3/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-57480-fix-branch-api-table-format' into 'master'	Achilleas Pipinellis	2019-02-11	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix branch API table format Closes #57480 See merge request gitlab-org/gitlab-ce!25091
\| * \| \| \| \| \| \| \| \| \|	Fix branch API table format	Mark Fletcher	2019-02-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '52424-goodbye-hipchat' into 'master'	Douglas Barbosa Alexandre	2019-02-11	28	-952/+53
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove HipChat integration from GitLab Closes #52424 See merge request gitlab-org/gitlab-ce!22223
\| * \| \| \| \| \| \| \| \| \|	Remove HipChat integration from GitLab	Nick Thomas	2019-02-08	28	-952/+53
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix_deployment_service_predefined_variables' into 'master'	Nick Thomas	2019-02-11	4	-1/+19
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing argument to DeploymentService#predefined_variables See merge request gitlab-org/gitlab-ce!24989