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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix LFS timeouts when trying to save large filessh-fix-lfs-from-moving-across-filesystems	Stan Hu	2017-06-04	3	-0/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The following was happening: 1. Workhorse stores an LFS file in /var/opt/gitlab/gitlab-rails/shared/lfs-objects 2. CarrierWave then renames the file to a temporary directory (e.g. /opt/gitlab/embedded/service/gitlab-rails/tmp) 3. CarrierWave then renames the file to its final location (e.g. /var/opt/gitlab/gitlab-rails/shared/lfs-objects) When the LFS upload path was on a different filesystem than the Rails installation, step 2 could take a longer than 10 seconds, at which point Workhorse would time out with "badgateway: failed after 10s: context canceled". This change makes the work path in the same root as the LFS storage path, preventing moves across filesystems. Closes #33218
*	Merge branch '32118-new-environment-btn-copy' into 'master'	Annabel Dunstone Gray	2017-06-03	4	-3/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	32118 Make New environment empty state btn lowercase Closes #32118 See merge request !11350
\| *	32118 Make New environment empty state btn lowercase32118-new-environment-btn-copy	tauriedavis	2017-06-02	4	-3/+9
\| \|
* \|	Merge branch '31943-document-go-18' into 'master'	Achilleas Pipinellis	2017-06-03	3	-16/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Document go1.8.3 as dependency See merge request !11245
\| * \|	Changelog31943-document-go-18	Kim "BKC" Carlbäcker	2017-06-02	1	-0/+3
\| \| \|
\| * \|	Go 1.8.3 and Upgrade-9.3 doc	Kim "BKC" Carlbäcker	2017-06-02	2	-12/+32
\| \| \|
\| * \|	Document go1.8.1 as dependency	Kim "BKC" Carlbäcker	2017-06-02	1	-8/+7
\| \| \|
* \| \|	Merge branch 'projects-api-import-status' into 'master'	Douwe Maan	2017-06-02	4	-0/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose import_status in Projects API Closes #19646 See merge request !11851
\| * \| \|	Expose import_status in Projects API	Robin Bobbitt	2017-06-02	4	-0/+37
\| \| \| \|
* \| \| \|	Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'	Douwe Maan	2017-06-02	7	-3/+49
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
\| * \| \| \|	Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-login	Maxime Besson	2017-06-02	7	-3/+49
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '32832-confidential-issue-overflow' into 'master'	Annabel Dunstone Gray	2017-06-02	2	-2/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	32832 Remove overflow from comment form for confidential issues and vertically a… Closes #32832 and #32926 See merge request !11867
\| * \| \| \|	32832 Remove overflow from comment form for confidential issues and ↵	tauriedavis	2017-06-02	2	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	vertically aligns confidential issue icon
* \| \| \| \|	Merge branch '28694-hard-delete-user-from-api' into 'master'	Douwe Maan	2017-06-02	5	-6/+43
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to be hard-deleted from the API See merge request !11853
\| * \| \| \| \|	Allow users to be hard-deleted from the API	Nick Thomas	2017-06-02	5	-6/+43
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dr-doc-typo' into 'master'	Stan Hu	2017-06-02	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo: craeted -> created See merge request !11886
\| * \| \| \| \| \|	Fixed typo: craeted -> created	denisroy	2017-06-02	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'	Robert Speicher	2017-06-02	10	-24/+166
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the new Gitaly CommitDiff RPC See merge request !11826
\| * \| \| \| \| \|	Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpc	Ahmad Sherif	2017-06-02	10	-24/+166
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rc/enable-PreferredHashMethods-cop' into 'master'	Robert Speicher	2017-06-02	25	-51/+53
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the Style/PreferredHashMethods cop See merge request !11883
\| * \| \| \| \| \| \|	Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-cop	Rémy Coutable	2017-06-02	25	-51/+53
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '33139-lint-our-factories' into 'master'	Grzegorz Bizon	2017-06-02	15	-47/+93
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lint our factories creation in addition to their build Closes #33139 See merge request !11823
\| * \| \| \| \| \| \|	Lint our factories creation in addition to their build33139-lint-our-factories	Rémy Coutable	2017-06-02	15	-47/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'jouve/gitlab-ce-admin_keys' into 'master'	Rémy Coutable	2017-06-02	2	-2/+7
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	redirect to keys index instead of user index after a key is deleted See merge request !11856
\| * \| \| \| \| \| \|	redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keys	Cyril Jouve	2017-06-01	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '2361-pending-migrations-break-current-settings' into 'master'	Rémy Coutable	2017-06-02	3	-4/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip loading application settings from the database when migrations are pending Closes gitlab-ee#2361 See merge request !11842
\| * \| \| \| \| \| \| \|	Skip loading application settings from the database when migrations are pending	Nick Thomas	2017-06-02	3	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Various Rails initializers (metrics, sentry, etc) are run before migrations, which can lead to a mismatch between app/models/application_settings.rb and schema.
* \| \| \| \| \| \| \| \|	Merge branch 'winh-styled-people-search-bar' into 'master'	Tim Zallmann	2017-06-02	12	-143/+414
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style people in issuable search bar Closes #30468 See merge request !11402
\| * \| \| \| \| \| \| \| \|	Style people in issuable search bar (!11402)winh-styled-people-search-bar	winh	2017-06-02	10	-22/+237
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move clear search button out of issuable search bar	winh	2017-06-02	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add frontend fixture for issue list	winh	2017-06-02	1	-0/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify filtered_search_visual_tokens_spec.js	winh	2017-06-02	1	-118/+163
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'job-details-increase-deboune' into 'master'33126-vue-js-timeago-add-missing-functionalities	Phil Hughes	2017-06-02	2	-4/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use throttle when window is resized Closes #33222 See merge request !11857
\| * \| \| \| \| \| \| \| \|	Use throttle when window is resized	Filipa Lacerda	2017-06-02	2	-4/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'port-refactor-wiki-page-services' into 'master'	Grzegorz Bizon	2017-06-02	3	-48/+53
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor specs for WikiPage services See merge request !11862
\| * \| \| \| \| \| \| \| \|	Refactor specs for WikiPage servicesport-refactor-wiki-page-services	Douglas Barbosa Alexandre	2017-06-02	3	-48/+53
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-06-02	3	-8/+50
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file' into 'master' Resolve "Merge conflict resolution removed the newline in the end of file" Closes #32983 See merge request !11817
\| * \| \| \| \| \| \| \|	Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file	Sean McGivern	2017-06-01	3	-8/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If our side of the conflict file has a trailing newline, and we are picking sections, not editing the whole content, then add a trailing newline back.
* \| \| \| \| \| \| \| \|	Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' ↵	James Lopez	2017-06-02	3	-1/+72
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add translations for elapsed time in words Closes #32747 See merge request !11769
\| * \| \| \| \| \| \| \| \|	Add translations for elapsed time in words32747-translation-of-dates-for-cycle-analytics-is-incomplete	Ruben Davila	2017-06-02	3	-1/+72
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '33242-create-project-for-user-api-ignores-path-parameter' into ↵	Sean McGivern	2017-06-02	3	-5/+26
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add optional path parameter and fix tests Closes #33242 See merge request !11868
\| * \| \| \| \| \| \| \| \| \|	Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameter	Athar Hameed	2017-06-02	3	-5/+26
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '28080-system-checks' into 'master'	Sean McGivern	2017-06-02	31	-479/+1197
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SystemCheck library for executing checks from a rake task See merge request !9173
\| * \| \| \| \| \| \| \| \| \|	Refactor and move things around to improve in YAGNI perspective	Gabriel Mazetto	2017-05-31	6	-102/+91
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix BasicExecutor specs	Gabriel Mazetto	2017-05-31	3	-31/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Changelog	Gabriel Mazetto	2017-05-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed and improved some existing checks and SystemCheck library	Gabriel Mazetto	2017-05-31	12	-77/+61
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix codestyle	Gabriel Mazetto	2017-05-31	4	-12/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve Specs and some fixes	Gabriel Mazetto	2017-05-31	6	-8/+198
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add ActiveUsers Check	Gabriel Mazetto	2017-05-31	2	-6/+19
\| \| \| \| \| \| \| \| \| \| \|