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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-url	Douwe Maan	2017-09-26	5	-5/+14
\|
*	Merge branch 'patch-2' into 'master'	Douwe Maan	2017-09-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update gitlab-shell to 5.9.2 See merge request gitlab-org/gitlab-ce!14446
\| *	Update gitlab-shell to 5.9.2	Jonathon Reinhart	2017-09-22	1	-1/+1
\| \| \| \| \| \|	See gitlab-shell!169
* \|	Merge branch 'rs-remove-dead-markdown-pipeline' into 'master'	Douwe Maan	2017-09-26	1	-32/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove dead `Gitlab::Markdown::Pipeline` class See merge request gitlab-org/gitlab-ce!14487
\| * \|	Remove dead `Gitlab::Markdown::Pipeline` classrs-remove-dead-markdown-pipeline	Robert Speicher	2017-09-25	1	-32/+0
\| \| \|
* \| \|	Merge branch '31094-define-color-priorities' into 'master'	Annabel Dunstone Gray	2017-09-26	12	-58/+58
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update color variables See merge request gitlab-org/gitlab-ce!14456
\| * \| \|	Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-priorities	Pedro Moreira da Silva	2017-09-23	12	-58/+58
\| \| \| \|
* \| \| \|	Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'	Jacob Schatz	2017-09-25	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RepoEditor: Fix reopening the existing file on refresh. Closes #38250 See merge request gitlab-org/gitlab-ce!14449
\| * \| \| \|	RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-file	Fatih Acet	2017-09-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '37912-fix-dash-in-note-access-role' into 'master'	Rémy Coutable	2017-09-25	2	-1/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a dash being rendered in the note's access role Closes #37912 See merge request gitlab-org/gitlab-ce!14450
\| * \| \| \| \|	Fix a dash being rendered in the note's access role	Micael Bergeron	2017-09-25	2	-1/+7
\|/ / / / /
* \| \| \| \|	Merge branch 'rc/tag-specs' into 'master'38362-delayed-pr-merge-wait-time-40m-1h	Robert Speicher	2017-09-25	1	-2/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `:type` to all specs See merge request gitlab-org/gitlab-ce!14371
\| * \| \| \| \|	Automatically set a :type for specsrc/tag-specs	Rémy Coutable	2017-09-22	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'docs/chmod-644' into 'master'	Rémy Coutable	2017-09-25	67	-2/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove execution permission (unix file permissions) for documentation Closes #38287 See merge request gitlab-org/gitlab-ce!14471
\| * \| \| \| \| \|	Check for exec permissions also in app/docs/chmod-644	Achilleas Pipinellis	2017-09-25	11	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add check for exec permissions and refactor lint doc script	Achilleas Pipinellis	2017-09-25	1	-2/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change mode to 644 for all md and png files	Achilleas Pipinellis	2017-09-25	56	-0/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '38155-autodevops-typo' into 'master'	Achilleas Pipinellis	2017-09-25	1	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix auto devops typos in Pipeline Settings view Closes #38155 See merge request gitlab-org/gitlab-ce!14403
\| * \| \| \| \| \|	Fix auto devops typos in Pipeline Settings view	Mark Fletcher	2017-09-22	1	-1/+2
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-fix-email-provider-take2' into 'master'	Yorick Peterse	2017-09-25	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PG::UniqueViolation external_email migration Closes #38246 See merge request gitlab-org/gitlab-ce!14474
\| * \| \| \| \| \|	Fix PG::UniqueViolation external_email migrationsh-fix-email-provider-take2	Stan Hu	2017-09-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Missing parens prevented this migration from working in some cases. Closes #38246
* \| \| \| \| \| \|	Merge branch '34371-cycle-analitcs-global' into 'master'	Phil Hughes	2017-09-25	4	-59/+54
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes cycle analytics service and store from global namespace See merge request gitlab-org/gitlab-ce!14463
\| * \| \| \| \| \| \|	Removes cycle analytics service and store from global namespace	Filipa Lacerda	2017-09-25	4	-59/+54
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'gitaly-508-find-commits' into 'master'38204-comment-form-doesn-t-switch-back-to-write-tab-after-submitting	Douwe Maan	2017-09-25	4	-2/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#log to Gitaly Closes gitaly#508 See merge request gitlab-org/gitlab-ce!14179
\| * \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#log to Gitaly	Kim "BKC" Carlbäcker	2017-09-25	4	-2/+44
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38189-fix-user-avatar-url-cdn' into 'master'	Douwe Maan	2017-09-25	3	-50/+79
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
\| * \| \| \| \| \| \| \|	Update tests to reflect `user_avatar_without_link` helper changes38189-fix-user-avatar-url-cdn	kushalpandya	2017-09-25	1	-40/+62
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add `data-src` when image is to be lazy loaded, use `tag` helper instead of ↵	kushalpandya	2017-09-25	1	-9/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`image_tag` helper
\| * \| \| \| \| \| \| \|	Remove unnecessary use of `gsub`	kushalpandya	2017-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve_sorting_list' into 'master'	Douwe Maan	2017-09-25	19	-332/+304
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320
\| * \| \| \| \| \| \| \| \|	Improve list of sorting options	Vitaliy @blackst0ne Klachkov	2017-09-23	19	-332/+304
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'project-page-clearer' into 'master'	Filipa Lacerda	2017-09-25	7	-7/+59
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364
\| * \| \| \| \| \| \| \| \|	simplify link_to callproject-page-clearer	Phil Hughes	2017-09-22	1	-4/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixes dashboard/projects empty state showing when viewing personal projects	Phil Hughes	2017-09-22	3	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by the `@projects` value being empty when the current user does not have any personal projects.
\| * \| \| \| \| \| \| \| \|	Add context tabs to dashboard/projects	Phil Hughes	2017-09-22	5	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045
* \| \| \| \| \| \| \| \| \|	Merge branch 'fly-out-nav-mousepos-error' into 'master'	Filipa Lacerda	2017-09-25	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338
\| * \| \| \| \| \| \| \| \|	spec fixesfly-out-nav-mousepos-error	Phil Hughes	2017-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed fly-out error if mousePos array is empty	Phil Hughes	2017-09-22	2	-1/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵	Douwe Maan	2017-09-25	5	-2/+44
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469
\| * \| \| \| \| \| \| \| \| \|	Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-check	Gabriel Mazetto	2017-09-25	5	-2/+44
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2017-09-25	1	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38021-add-instructions-for-upgrading-from-ce-to-ee-using-gitlab-omnibus-chart-docs' into 'master' Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs Closes #38021 See merge request gitlab-org/gitlab-ce!14347
\| * \| \| \| \| \| \| \| \| \|	Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs	Joshua Lambert	2017-09-25	1	-0/+16
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-allow-name-on-anchors' into 'master'	Douwe Maan	2017-09-25	3	-3/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452
\| * \| \| \| \| \| \| \| \| \|	Make the "customizes the whitelist only once" spec less brittlers-allow-name-on-anchors	Robert Speicher	2017-09-22	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Re-allow `name` attribute on user-provided anchor HTML	Robert Speicher	2017-09-22	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rc/refactor-project_policy_spec-ce' into 'master'	Douwe Maan	2017-09-25	1	-47/+86
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor spec/policies/project_policy_spec.rb to minimize the diff with EE See merge request gitlab-org/gitlab-ce!14434
\| * \| \| \| \| \| \| \| \| \| \|	Refactor spec/policies/project_policy_spec.rb to minimize the diff with EErc/refactor-project_policy_spec-ce	Rémy Coutable	2017-09-22	1	-47/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '37287-remove-nav-gradient' into 'master'	Phil Hughes	2017-09-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove navbar gradient Closes #37287 See merge request gitlab-org/gitlab-ce!14457
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove navbar gradient37287-remove-nav-gradient	Annabel Dunstone Gray	2017-09-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-remove-additional-grit-settings' into 'master'	Rémy Coutable	2017-09-25	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Grit settings from default settings See merge request gitlab-org/gitlab-ce!14465