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	5	-2/+38
\| \| \| \|	Closes #41739
*	Revert "Fix Route validation for unchanged path"	Michael Kozono	2018-01-09	2	-61/+1
\| \| \| \|	This reverts commit 8040edcce8b4e736b4f4857e6709f94aeb5e274c.
*	Revert "Add test for permanent redirects of descendants"	Michael Kozono	2018-01-09	1	-14/+0
\| \| \| \|	This reverts commit a2cb92495c3149b69eb734596e80fbdd54b0b2dc.
*	Add test for permanent redirects of descendants	Michael Kozono	2018-01-09	1	-0/+14
\|
*	Fix Route validation for unchanged path	Michael Kozono	2018-01-09	2	-1/+61
\|
*	Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'	Douwe Maan	2018-01-09	4	-0/+91
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixing bug related to wiki last version Closes #41477 and #41506 See merge request gitlab-org/gitlab-ce!16197
\| *	Fixing bug related to wiki last version	Francisco Javier López	2018-01-09	4	-0/+91
\|/
*	Merge branch 'improve-ssh-lookup-docs' into 'master'	Douwe Maan	2018-01-09	2	-28/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improve SSH database key lookup documentation Closes #41399 See merge request gitlab-org/gitlab-ce!16048
\| *	Use the new gitlab-shell authorized-keys helper in documentation	Nick Thomas	2018-01-09	2	-28/+6
\| \|
* \|	Merge branch '41570-max-height-dropdown' into 'master'	Phil Hughes	2018-01-09	5	-11/+7
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Resolve "Download menu expands past the fold and doesn't auto size to the bottom height of the browser window" Closes #41570 See merge request gitlab-org/gitlab-ce!16299
\| *	Change max-height of all dropdowns to 312px41570-max-height-dropdown	Annabel Dunstone Gray	2018-01-08	5	-11/+7
\| \|
* \|	Merge branch 'changes-dropdown-ellipsis' into 'master'	Sean McGivern	2018-01-09	5	-4/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #41561
* \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2018-01-09	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix example in ci ssh_keys documentation See merge request gitlab-org/gitlab-ce!16079
\| * \| \|	fix example in ci ssh_keys documentation	Vincent Lae	2017-12-21	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs-push-web-hook-note' into 'master'	Achilleas Pipinellis	2018-01-09	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about only 20 commits being included in push payload See merge request gitlab-org/gitlab-ce!16149
\| * \| \| \|	Add note about only 20 commits being included in push payloaddocs-push-web-hook-note	Drew Blessing	2017-12-27	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/rs-fix-changelog-header-level' into 'master'	Achilleas Pipinellis	2018-01-09	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the header level for the Changelog Arguments documentation See merge request gitlab-org/gitlab-ce!16158
\| * \| \| \| \|	Fix the header level for the Changelog Arguments documentationdocs/rs-fix-changelog-header-level	Robert Speicher	2017-12-28	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-19843-specify-archive-sha-options' into 'master'	Achilleas Pipinellis	2018-01-09	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specifies the accepted refs for downloading an archive via the API Closes #19843 See merge request gitlab-org/gitlab-ce!16222
\| * \| \| \| \| \|	Specifies the accepted refs for downloading an archive via the API	Mark Fletcher	2018-01-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-24' into 'master'	Achilleas Pipinellis	2018-01-09	1	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update irker documentation to mention an irker bug with key-protected channels. See merge request gitlab-org/gitlab-ce!16274
\| * \| \| \| \| \| \|	Update irker documentation to mention an irker bug with key-protected channels.	Mattia Rizzolo	2018-01-08	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Mattia Rizzolo <mattia@debian.org>
* \| \| \| \| \| \| \|	Merge branch 'fj-41681-add-param-disable-commit-stats-api' into 'master'	Douwe Maan	2018-01-09	7	-3/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to disable commit stats to commit API Closes #41681 See merge request gitlab-org/gitlab-ce!16309
\| * \| \| \| \| \| \| \|	Add option to disable commit stats to commit API	Francisco Javier López	2018-01-09	7	-3/+63
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'doc-development-architecture.md-remove-unnecessary-line' into ↵	Achilleas Pipinellis	2018-01-09	1	-2/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix: remove unnecessary line Closes #41501 See merge request gitlab-org/gitlab-ce!16289
\| * \| \| \| \| \| \| \|	Fix: remove unnecessary line	Onuwa Nnachi Isaac	2018-01-08	1	-2/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'	Douwe Maan	2018-01-09	18	-14/+749
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spec in shell_spec.rb	James Edwards-Jones	2018-01-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The spec for "#add_key does nothing" would always have passed, since the expectation was on both the wrong object and message.
\| * \| \| \| \| \| \| \| \|	Fix typo in spec/requests/api/internal_spec.rb	James Edwards-Jones	2018-01-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Backport spec fixes in spec/lib/gitlab/shell_spec.rb	Valery Sizov	2018-01-08	1	-10/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make Gitlab::CurrentSettings available when getting settings	Sean McGivern	2018-01-08	1	-8/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Avoid adding index if already exists	Paco Guzman	2018-01-08	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Backport authorized_keys_enabled defaults to true'	Michael Kozono	2018-01-08	5	-7/+289
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Originally from branch 'fix-authorized-keys-enabled-default-2738' via merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240 Removed background migrations which were intended to fix state after using Gitlab without a default having been set Squashed commits: Locally, if Spring was not restarted, `current_application_settings` was still cached, which prevented the migration from editing the file. This will also ensure that any app server somehow hitting old cache data will properly default this setting regardless. Retroactively fix migration This allows us to identify customers who ran the broken migration. Their `authorized_keys_enabled` column does not have a default at this point. We will fix the column after we fix the `authorized_keys` file. Fix authorized_keys file if needed Add default to authorized_keys_enabled setting Reminder: The original migration was fixed retroactively a few commits ago, so people who did not ever run GitLab 9.3.0 already have a column that defaults to true and disallows nulls. I have tested on PostgreSQL and MySQL that it is safe to run this migration regardless. Affected customers who did run 9.3.0 are the ones who need this migration to fix the authorized_keys_enabled column. The reason for the retroactive fix plus this migration is that it allows us to run a migration in between to fix the authorized_keys file only for those who ran 9.3.0. Tweaks to address feedback Extract work into background migration Move batch-add-logic to background migration Do the work synchronously to avoid multiple workers attempting to add batches of keys at the same time. Also, make the delete portion wait until after adding is done. Do read and delete work in background migration Fix Rubocop offenses Add changelog entry Inform the user of actions taken or not taken Prevent unnecessary `select`s and `remove_key`s Add logs for action taken Fix optimization Reuse `Gitlab::ShellAdapter` Guarantee the earliest key Fix migration spec for MySQL
\| * \| \| \| \| \| \| \| \|	Use ApplicationSetting.current in Admin::ApplicationSettingsController	Rémy Coutable	2018-01-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request gitlab-org/gitlab-ee!3323 Backported as part of authorized_keys in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16014
\| * \| \| \| \| \| \| \| \|	Combine ssh docs and rename the doc	Ernst van Nierop	2018-01-08	3	-70/+194
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport to CE, originally branch 'evn-ssh-clarify-docs See merge request gitlab-org/gitlab-ee!3753
\| * \| \| \| \| \| \| \| \|	Backport option to disable writing to `authorized_keys` file	Michael Kozono	2018-01-08	11	-13/+217
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Originally branch 'mk-toggle-writing-to-auth-keys-1631' See merge request !2004 Squashed commits: Add authorized_keys_enabled to Application Settings Ensure default settings are exposed in UI Without this change, `authorized_keys_enabled` is unchecked when it is nil, even if it should be checked by default. Add “Speed up SSH operations” documentation Clarify the reasons for disabling writes Add "How to go back" section Tweak copy Update Application Setting screenshot
\| * \| \| \| \| \| \| \| \|	Backport authorized_keys branch 'find-key-by-fingerprint'	Pablo Carranza	2018-01-08	5	-0/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add find key by base64 key or fingerprint to the internal API See merge request !250 Squashed changes: Add unique index to fingerprint Add new index to schema Add internal api to get ssh key by fingerprint Change API endpoint to authorized_keys Add InsecureKeyFingerprint that calculates the fingerprint without shelling out Add require for gitlab key fingerprint Remove uniqueness of fingerprint index Remove unique option from migration Fix spec style in fingerprint test Fix rubocop complain Extract insecure key fingerprint to separate file Change migration to support building index concurrently Remove those hideous tabs
* \| \| \| \| \| \| \| \| \|	Merge branch '36906_Reordering_issues_to_the_bottom' into 'master'	Phil Hughes	2018-01-09	3	-1/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing re-ordering of an issue when dragging it to the bottom a long issue list in the board Closes #36906 See merge request gitlab-org/gitlab-ce!16250
\| * \| \| \| \| \| \| \| \| \|	Fixing re-ordering of an issue when dragging it to the bottom a long issue ↵	David Kuri	2018-01-09	3	-1/+18
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list in the board
* \| \| \| \| \| \| \| \| \|	Merge branch 'move-markdown-preview' into 'master'	Phil Hughes	2018-01-09	3	-184/+182
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove preview_markdown from the global obj See merge request gitlab-org/gitlab-ce!16025
\| * \| \| \| \| \| \| \| \| \|	Remove preview_markdown from the global obj	Jacob Schatz	2018-01-09	3	-184/+182
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '41404-pipelines-charts' into 'master'	Phil Hughes	2018-01-09	3	-8/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pipeline graph uses inconsistent colors for its legend and its content" Closes #41404 See merge request gitlab-org/gitlab-ce!16260
\| * \| \| \| \| \| \| \| \| \| \|	Change pipeline charts colors to match legend41404-pipelines-charts	Annabel Dunstone Gray	2018-01-08	3	-8/+16
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'check-environment-regex-ce' into 'master'	Grzegorz Bizon	2018-01-09	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport "Fix environment scope regex" to CE Closes gitlab-ee#4308 See merge request gitlab-org/gitlab-ce!15945
\| * \| \| \| \| \| \| \| \| \| \|	Add speccheck-environment-regex-ce	Shinya Maeda	2018-01-08	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'check-environment-regex' into 'master'	Grzegorz Bizon	2018-01-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix environment scope regex See merge request gitlab-org/gitlab-ee!3641
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-store-user-in-api-logs' into 'master'	Sean McGivern	2018-01-09	5	-1/+38
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Save user ID and username in Grape API log (api_json.log) See merge request gitlab-org/gitlab-ce!16264
\| * \| \| \| \| \| \| \| \| \| \| \|	Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logs	Stan Hu	2018-01-08	5	-1/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will enable admins to identify who actually made the API request. Relates to #36960