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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Test with only the deploy key specml-qa-clone-deploy-only	Mark Lapierre	2018-09-12	33	-1134/+0
\|
*	Add an SSH key and use it to clone and push	Mark Lapierre	2018-09-12	15	-18/+230
\|
*	Merge branch 'jlenny-UpdateProductDiscoverySteps' into 'master'	Achilleas Pipinellis	2018-09-11	1	-4/+6
\|\ \| \| \| \| \| \| \| \|	Add steps for closing product discovery issue See merge request gitlab-org/gitlab-ce!21273
\| *	Update design.md	Mark Pundsack	2018-09-10	1	-6/+3
\| \|
\| *	Add steps for closing product discovery issuejlenny-UpdateProductDiscoverySteps	Jason Lenny	2018-08-17	1	-4/+9
\| \|
\| *	Add steps for closing product discovery issue	Jason Lenny	2018-08-17	0	-0/+0
\| \|
* \|	Merge branch 'sh-test-ldap-clones-via-gitlab-qa' into 'master'	Grzegorz Bizon	2018-09-11	4	-5/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	QA: Add support for testing Git over HTTP with LDAP users See merge request gitlab-org/gitlab-ce!21354
\| * \	Merge branch 'master' into sh-test-ldap-clones-via-gitlab-qa	Stan Hu	2018-08-29	826	-1984/+4602
\| \|\ \
\| * \| \|	Add support for testing Git over HTTP with LDAP users	Stan Hu	2018-08-22	4	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would have helped catch https://gitlab.com/gitlab-org/gitlab-ce/issues/50579.
* \| \| \|	Merge branch 'rails5-fix-issue-move-service' into 'master'	Grzegorz Bizon	2018-09-11	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5: fix issue move service See merge request gitlab-org/gitlab-ce!21616
\| * \| \| \|	Rails 5: fix issue move service	Jasper Maes	2018-09-11	2	-1/+7
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In rails 5, the attributes method for an enum returns the name instead of the database integer.
* \| \| \|	Merge branch 'sh-fix-ee-issue-7543' into 'master'	Bob Van Landuyt	2018-09-11	1	-10/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add stub methods for FakeApplicationSetting Closes gitlab-ee#7543 See merge request gitlab-org/gitlab-ce!21662
\| * \| \| \|	Add additional stub methods for FakeApplicationSetting	Stan Hu	2018-09-10	1	-10/+18
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In a migration spec, a default ApplicationSetting object may fail to create due to an unknown attribute and fall back to FakeApplicationSetting. FakeApplicationSetting appears to be missing a number of methods that are needed (https://gitlab.com/gitlab-org/gitlab-ce/issues/47491). This commit adds the ones needed to make an EE spec pass. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7543
* \| \| \|	Merge branch 'ml-qa-ldap-admin-license' into 'master'	Stan Hu	2018-09-10	6	-49/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Sign in as an admin account when adding a license See merge request gitlab-org/gitlab-ce!21657
\| * \| \| \|	Enable signing in as admin when adding a license	Mark Lapierre	2018-09-10	6	-49/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the ability to use admin credentials to add a license so that when testing an LDAP user on EE the LDAP user does not have to be an admin. Admin credentials default to GDK's root user. Can be overriden via ADMIN_USERNAME and ADMIN_PASSWORD environment variables.
* \| \| \| \|	Merge branch 'leipert-wrap-license-file' into 'master'	Robert Speicher	2018-09-10	1	-3/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	properly wrap LICENSE file [ci skip] See merge request gitlab-org/gitlab-ce!21604
\| * \| \| \| \|	properly wrap LICENSE file	Lukas Eipert	2018-09-08	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch '51268-clear-in-memory-application-settings-between-examples' ↵	Robert Speicher	2018-09-10	3	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Changes in in-memory application settings in one spec can break another spec" Closes #51268 See merge request gitlab-org/gitlab-ce!21638
\| * \| \| \| \| \|	Simplify setting of in_memory_application_settings	Stan Hu	2018-09-10	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Work around migration specs failing due to repository storages not being ↵	Stan Hu	2018-09-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	selected Migration specs may be missing a column necessary to create an ApplicationSetting object, which causes the FakeApplicationSetting to be initialized. However, the project selects a random repository storage via ApplicationSetting#pick_repository_storage, which isn't present in the OpenStruct. To workaround this issues, we add a pick_repository_storage method in FakeApplicationSetting.
\| * \| \| \| \| \|	Ensure in-memory application settings are cleared before each test	Rémy Coutable	2018-09-10	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'leipert-upgrade-karma' into 'master'	Clement Ho	2018-09-10	2	-942/+73
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update karma: 2.0.4 -> ^3.0.0 See merge request gitlab-org/gitlab-ce!21593
\| * \| \| \| \| \| \|	update karma: 2.0.4 -> ^3.0.0	Lukas Eipert	2018-09-07	2	-942/+73
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'glui-tooltip' into 'master'	Mike Greiling	2018-09-10	4	-10/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add tooltip directive from gitlab-ui See merge request gitlab-org/gitlab-ce!21522
\| * \| \| \| \| \| \| \|	add tooltip directive from gitlab-ui	Simon Knox	2018-09-10	4	-10/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-09-10	6	-60/+118
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'da-synchronize-the-default-branch-when-updating-a-remote-mirror' into 'master' Synchronize the default branch when updating a remote mirror See merge request gitlab-org/gitlab-ce!21653
\| * \| \| \| \| \| \|	Add CHANGELOG	Douglas Barbosa Alexandre	2018-09-10	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Synchronize the default branch when updating a remote mirror	Douglas Barbosa Alexandre	2018-09-10	5	-60/+113
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ce-7471-extract-ee-specific-models-from-all_models-yml' into ↵	Robert Speicher	2018-09-10	1	-16/+26
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [CE] Make spec/lib/gitlab/import_export/all_models.yml EE-ready Closes gitlab-ee#7471 See merge request gitlab-org/gitlab-ce!21544
\| * \| \| \| \| \| \|	Make spec/lib/gitlab/import_export/all_models.yml EE-ready	Rémy Coutable	2018-09-10	1	-16/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This port https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7254 to CE. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'sh-upgrade-katex-0.9.0' into 'master'	Clement Ho	2018-09-10	3	-6/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump KaTeX version to 0.9.0 Closes #51065 See merge request gitlab-org/gitlab-ce!21625
\| * \| \| \| \| \| \| \|	Bump KaTeX version to 0.9.0	Stan Hu	2018-09-10	3	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #51065
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-move-import-common-metrics-migration' into 'master'	Kamil Trzciński	2018-09-10	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset column information before running CommonMetricsImporter Closes #51305 See merge request gitlab-org/gitlab-ce!21647
\| * \| \| \| \| \| \| \| \|	Reset column information in CommonMetricsImporter	Bob Van Landuyt	2018-09-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure that newly created columns would be available when migrating in one go.
* \| \| \| \| \| \| \| \| \|	Merge branch 'enforce-good-commit-messages' into 'master'	Robert Speicher	2018-09-10	2	-0/+193
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforce good commit messages using Danger Closes #50003 See merge request gitlab-org/gitlab-ce!21527
\| * \| \| \| \| \| \| \| \| \|	Added Danger file to lint commit messages	Yorick Peterse	2018-09-10	2	-0/+193
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This Dangerfile ensures that commit authors write good commit messages. We also prevent the use of Emoji, since these add no value and may not always be displayed properly. Merge commits are currently ignored. In the future we most likely want to stop using these, but this is a separate discussion, hence we ignore them for the time being. The rules enforced by this Dangerfile are based on the article found at https://chris.beams.io/posts/git-commit/. For more information, refer to https://gitlab.com/gitlab-org/gitlab-ce/issues/50003. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/50003
* \| \| \| \| \| \| \| \| \|	Merge branch '48902-fix-diff-vertical-alignment' into 'master'	Annabel Dunstone Gray	2018-09-10	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix vertical alignment of text in diffs Closes #48902 See merge request gitlab-org/gitlab-ce!21573
\| * \| \| \| \| \| \| \| \|	Fix vertical alignment of text in diffs	Paul Slaughter	2018-09-06	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds changelog
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-sidekiq-5.2.1' into 'master'	Robert Speicher	2018-09-10	3	-13/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Sidekiq 5.1.3 to 5.2.1 See merge request gitlab-org/gitlab-ce!21624
\| * \| \| \| \| \| \| \| \| \|	Explicitly enable usage ping for instance statistics spec	Stan Hu	2018-09-09	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is similar to https://gitlab.com/gitlab-org/gitlab-ee/issues/7511, but the root cause is https://gitlab.com/gitlab-org/gitlab-ce/issues/51268.
\| * \| \| \| \| \| \| \| \| \|	Bump Sidekiq 5.1.3 to 5.2.1	Stan Hu	2018-09-09	3	-13/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The most significant change in this version is that the default concurrency has been lowered from 25 to 10 (https://github.com/mperham/sidekiq/issues/3892). This doesn't affect omnibus-gitlab because the concurrency is controlled via a setting that defaults to 25 anyway and is passed in via the `-c` command-line parameter. However, source installations (including the GDK) will have to either specify the concurrency in `sidekiq.yml` or use the `-c` option. Full list of changes: https://github.com/mperham/sidekiq/blob/master/Changes.md
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-gitlab-shell-8.3.1' into 'master'	Bob Van Landuyt	2018-09-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 8.3.1 See merge request gitlab-org/gitlab-ce!21648
\| * \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 8.3.1	Stan Hu	2018-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8.3.0 was tagged with the commit before the CHANGELOG.md and version.rb bump, so this just fixes a harmless warning.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2018-09-10	1	-13/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: Correct YAML indentation See merge request gitlab-org/gitlab-ce!21631
\| * \| \| \| \| \| \| \| \| \| \|	Correct YAML indentation	Cam	2018-09-10	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-jobs-api-docs' into 'master'	Rémy Coutable	2018-09-10	1	-13/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `duration` attributes to Jobs API docs See merge request gitlab-org/gitlab-ce!21626
\| * \| \| \| \| \| \| \| \| \| \| \|	Add `duration` attributes to Jobs API docs	Mehdi Lahmam	2018-09-09	1	-13/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up to !13644.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '21371-changelog' into 'master'	Rémy Coutable	2018-09-10	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog to !21371 See merge request gitlab-org/gitlab-ce!21615
\| * \| \| \| \| \| \| \| \| \| \| \|	Add changelog to !21371	Vicary Archangel	2018-09-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'lock-unlock-quick-actions' into 'master'	Rémy Coutable	2018-09-10	8	-5/+162
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add /lock and /unlock quick actions Closes #39173 See merge request gitlab-org/gitlab-ce!15197