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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Stop toggle sidebar button from changing height on collapse39974-toggle-sidebar-btn	Annabel Dunstone Gray	2017-12-15	1	-1/+2
\|
*	Merge branch 'master' into 'master'	Rémy Coutable	2017-12-15	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	fix issue #39843 Incorrect guidance stating blocked users will be removed from groups and projects as members Closes #39843 See merge request gitlab-org/gitlab-ce!15947
\| *	fix issue #39843 Incorrect guidance stating blocked users will be removed ↵	Cesar Apodaca	2017-12-15	2	-1/+6
\|/ \| \| \|	from groups and projects as members
*	Merge branch '38239-update-toggle-design' into 'master'	Filipa Lacerda	2017-12-15	6	-51/+81
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update feature toggle design to use icons and make it i18n friendly Closes #38239 See merge request gitlab-org/gitlab-ce!15904
\| *	Add changelog entry38239-update-toggle-design	Kushal Pandya	2017-12-15	1	-0/+5
\| \|
\| *	Update tests for toggle design change	Kushal Pandya	2017-12-15	1	-3/+11
\| \|
\| *	Update toggle styles to use icons	Kushal Pandya	2017-12-15	1	-30/+34
\| \|
\| *	Use icons instead of string labels for toggles	Kushal Pandya	2017-12-15	3	-18/+31
\| \|
* \|	Merge branch 'rc/use-factory_bot_rails' into 'master'	Robert Speicher	2017-12-15	125	-175/+175
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919
\| * \|	Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails	Rémy Coutable	2017-12-14	125	-175/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl */.rake */.rb -s -l \| xargs sed -i "" "s\|FactoryGirl\|FactoryBot\|" grep -e factory_girl */.rake */.rb -s -l \| xargs sed -i "" "s\|factory_girl\|factory_bot\|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'ph-more-es-modules' into 'master'	Filipa Lacerda	2017-12-15	13	-503/+466
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export JS classes as modules See merge request gitlab-org/gitlab-ce!15952
\| * \| \|	Export JS classes as modulesph-more-es-modules	Phil Hughes	2017-12-15	13	-503/+466
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#38869
* \| \| \|	Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ↵	Nick Thomas	2017-12-15	2	-4/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Don't use Markdown cache for stubbed settings in specs Closes #41130 See merge request gitlab-org/gitlab-ce!15954
\| * \| \| \|	Don't use Markdown cache for stubbed settings in specsignore-markdown-cache-when-stubbing-application-settings	Sean McGivern	2017-12-15	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ApplicationSetting model uses the CacheMarkdownField concern, which updates the cached HTML when the field is updated in the database. However, in specs, when we want to test conditions using ApplicationSetting, we stub it, because this is accessed in different ways throughout the application. This means that if a spec runs that caches one of the Markdown fields, and a later spec uses `stub_application_setting` to set the raw value of that field, the cached value was still the original one. We can work around this by ignoring the Markdown cache in contexts where we're using `stub_application_setting`. We could be smarter, and only do this on the Markdown fields of the model, but this is probably fine.
* \| \| \| \|	Merge branch '41073-fix-help-links' into 'master'	Rémy Coutable	2017-12-15	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make help link open in new tab Closes #41073 See merge request gitlab-org/gitlab-ce!15912
\| * \| \| \| \|	make link open in new tab41073-fix-help-links	Brett Walker	2017-12-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix Rubocop offense in QA project specs	Grzegorz Bizon	2017-12-15	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'qa/gb/gitlab-qa-factories' into 'master'	Grzegorz Bizon	2017-12-15	15	-197/+199
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename QA scenarios to make factory concept explicit Closes gitlab-qa#86 See merge request gitlab-org/gitlab-ce!15914
\| * \| \| \| \| \|	Fix remaining calls to GitLab QA factoriesqa/gb/gitlab-qa-factories	Grzegorz Bizon	2017-12-15	4	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename QA scenarios to make factory concept explicit	Grzegorz Bizon	2017-12-15	12	-191/+195
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs/sast' into 'master'	Dmitriy Zaporozhets	2017-12-15	1	-0/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SAST docs Closes gitlab-ee#4125 See merge request gitlab-org/gitlab-ce!15859
\| * \| \| \| \| \| \|	Add SAST docs	Achilleas Pipinellis	2017-12-15	1	-0/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dm-ldap-email-readonly' into 'master'	Sean McGivern	2017-12-15	11	-45/+108
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure user email is read only when synced with LDAP Closes #41033 See merge request gitlab-org/gitlab-ce!15915
\| * \| \| \| \| \| \| \|	Make sure user email is read only when synced with LDAP	Douwe Maan	2017-12-15	11	-45/+108
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '38145_ux_issues_in_system_info_page' into 'master'	Sean McGivern	2017-12-15	3	-9/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UX issues in system info page Closes #38145 See merge request gitlab-org/gitlab-ce!15802
\| * \| \| \| \| \| \| \| \|	Fix UX issues in system info page	Gilbert Roulot	2017-12-15	3	-9/+14
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '41014-bump-svg-version' into 'master'	Phil Hughes	2017-12-15	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update svg package version Closes #41014 See merge request gitlab-org/gitlab-ce!15941
\| * \| \| \| \| \| \| \| \|	Update svg package version	Filipa Lacerda	2017-12-15	2	-4/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '41136-job-erased' into 'master'	Filipa Lacerda	2017-12-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change text from build to job in flash notice Closes #41136 See merge request gitlab-org/gitlab-ce!15948
\| * \| \| \| \| \| \| \| \|	Change text from build to job in flash notice41136-job-erased	Annabel Dunstone Gray	2017-12-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-add-auto-pipeline' into 'master'	Achilleas Pipinellis	2017-12-15	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about automatic pipelines when enabling Auto DevOps See merge request gitlab-org/gitlab-ce!15946
\| * \| \| \| \| \| \| \| \| \|	Add note about automatic pipelines when enabling Auto DevOps	Fabio Busatto	2017-12-15	1	-0/+4
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Sean McGivern	2017-12-15	1	-9/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix formatting of parameters for new group and transfer project to group See merge request gitlab-org/gitlab-ce!15822
\| * \| \| \| \| \| \| \| \|	Fix type description	Michael Lihs	2017-12-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix formatting of parameters for new group and transfer project to group	Michael Lihs	2017-12-08	1	-9/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-conflicts-prep' into 'master'	Sean McGivern	2017-12-15	3	-34/+33
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify conflict resolver interface See merge request gitlab-org/gitlab-ce!15897
\| * \| \| \| \| \| \| \| \| \|	Simplify conflict resolver interfacegitaly-conflicts-prep	Alejandro Rodríguez	2017-12-14	3	-34/+33
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This does two things: - Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the former. - Depend on only the target repository for conflict listing. For conflict resolution, treat one repository as a remote one so that we can implement it as such in Gitaly.
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-update-documentation-guidelines' into 'master'	🚄 Job van der Voort 🚀	2017-12-15	2	-83/+91
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs update documentation guidelines See merge request gitlab-org/gitlab-ce!15811
\| * \| \| \| \| \| \| \| \| \|	Docs update documentation guidelines	Marcia Ramos	2017-12-15	2	-83/+91
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '38541-cancel-alignment' into 'master'	Filipa Lacerda	2017-12-15	2	-6/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix button alignment on MWPS component Closes #38541 See merge request gitlab-org/gitlab-ce!15835
\| * \| \| \| \| \| \| \| \| \|	fix button alignment on MWPS component38541-cancel-alignment	Simon Knox	2017-12-11	2	-6/+18
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '41016-import-gitlab-shell-projects' into 'master'	Douwe Maan	2017-12-15	8	-128/+865
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import gitlab-shell gitlab_projects.rb as at v5.10.2 Closes #41016 See merge request gitlab-org/gitlab-ce!15853
\| * \| \| \| \| \| \| \| \|	Import gitlab_projects.rb from gitlab-shell	Nick Thomas	2017-12-14	8	-128/+865
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By importing this Ruby code into gitlab-rails (and gitaly-ruby), we avoid 200ms of startup time for each gitlab_projects subprocess we are eliminating. By not having a gitlab_projects subprocess between gitlab-rails / sidekiq and any git subprocesses (e.g. for fork_project, fetch_remote, etc, calls), we can also manage these git processes more cleanly, and avoid sending SIGKILL to them
* \| \| \| \| \| \| \| \|	Merge branch 'backport-ee-3706' into 'master'	Dmitriy Zaporozhets	2017-12-15	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add eager-load paths to autoload paths to fix Rake tasks See merge request gitlab-org/gitlab-ce!15940
\| * \| \| \| \| \| \| \| \|	Add eager-load paths to autoload paths to fix Rake tasks	Nick Thomas	2017-12-14	1	-0/+4
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rake doesn't respect eager-loading, so to avoid explicit requires we have to duplicate the eager-load config into the auto-load config. This backports an EE change made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3706
* \| \| \| \| \| \| \| \|	Merge branch 'lfs-badge' into 'master'	Douwe Maan	2017-12-15	11	-1/+93
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added LFS badge to indicate LFS tracked files Closes #15567 See merge request gitlab-org/gitlab-ce!15845
\| * \| \| \| \| \| \| \|	moved lfs_blob_ids method into ExtractsPath modulelfs-badge	Phil Hughes	2017-12-14	3	-8/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2017-12-14	3	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	moved lfs blob fetch from extractspath file	Phil Hughes	2017-12-14	5	-6/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added specs	Phil Hughes	2017-12-12	2	-0/+68
\| \| \| \| \| \| \| \| \|