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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Indent as Rubocop likeqa-clone-with-deploy-key	Lin Jen-Shin	2018-02-14	1	-8/+9
\|
*	Fix the use to Git::Location	Lin Jen-Shin	2018-02-14	2	-6/+6
\|
*	Merge remote-tracking branch 'upstream/master' into qa-clone-with-deploy-key	Lin Jen-Shin	2018-02-13	260	-13917/+19820
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (69 commits) Change issue show page to group MRs by projects and namespaces Merge branch 'master-i18n' into 'master' Update sidekiq_style_guide.md Document all_queues.yml in sidekiq_style_guide.md Fix artifact creation Fix Error 500s creating merge requests with external issue tracker Addressed mr observations Clean new Flash() and stop disabling no-new (eslint) when possible Disable query limiting warnings for now on GitLab.com Dry up spec Add changelog entry Schedule PopulateUntrackedUploads if needed Fix orphan temp table untracked_files_for_uploads Fix last batch size equals max batch size error Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" Fix warning messages for promoting labels and milestones Fixed missing js selector for the realtime pipelines commit comp Reuse getter Add loading button for better UX Honour workhorse provided file name Fix a transient failure in db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb where symlink already exists ...
\| *	Merge branch 'document-all-queues-yml' into 'master'	Kamil Trzciński	2018-02-13	1	-0/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Document all_queues.yml in sidekiq_style_guide.md See merge request gitlab-org/gitlab-ce!17079
\| \| *	Update sidekiq_style_guide.mddocument-all-queues-yml	Dylan Griffith	2018-02-13	1	-2/+2
\| \| \|
\| \| *	Document all_queues.yml in sidekiq_style_guide.md	Dylan Griffith	2018-02-13	1	-0/+3
\| \| \|
\| * \|	Merge branch '26466-natural-sort-mrs' into 'master'	Sean McGivern	2018-02-13	4	-2/+52
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group MR numbers on issue show page by project and namespace Closes #26466 See merge request gitlab-org/gitlab-ce!8494
\| \| * \|	Change issue show page to group MRs by projects and namespaces	Jeff Stubler	2018-02-13	4	-2/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #26466.
\| * \| \|	Merge branch 'qa/mk-fix-artifact-creation' into 'master'	Grzegorz Bizon	2018-02-13	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix artifact creation in CI/CD QA spec See merge request gitlab-org/gitlab-ce!17078
\| \| * \| \|	Fix artifact creationqa/mk-fix-artifact-creation	Michael Kozono	2018-02-12	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'bvl-port-of-ee-translations' into 'master'	Douwe Maan	2018-02-13	16	-2933/+17627
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of EE-translations See merge request gitlab-org/gitlab-ce!17081
\| \| * \| \| \|	Merge branch 'master-i18n' into 'master'	Douwe Maan	2018-02-13	16	-2933/+17627
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Crowdin translations See merge request gitlab-org/gitlab-ee!4481
\| * \| \| \|	Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'	Douwe Maan	2018-02-13	5	-119/+118
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "PrepareUntrackedUploads PostgreSQL syntax error" Closes #42881 See merge request gitlab-org/gitlab-ce!17019
\| \| * \| \| \|	Dry up specmk-fix-no-untracked-upload-files-error	Michael Kozono	2018-02-12	1	-107/+29
\| \| \| \| \| \|
\| \| * \| \| \|	Add changelog entry	Michael Kozono	2018-02-12	1	-0/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Schedule PopulateUntrackedUploads if needed	Michael Kozono	2018-02-12	2	-1/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To finish migrating untracked files to uploads for installations that were affected by https://gitlab.com/gitlab-org/gitlab-ce/issues/42881 Or just to delete the temp table if it is empty and left behind.
\| \| * \| \| \|	Fix orphan temp table untracked_files_for_uploads	Michael Kozono	2018-02-12	2	-26/+27
\| \| \| \| \| \|
\| \| * \| \| \|	Fix last batch size equals max batch size error	Michael Kozono	2018-02-12	2	-1/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '42923-close-issue' into 'master'	Phil Hughes	2018-02-13	15	-49/+238
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Can't close issue through buttons in the textarea on mobile" Closes #42923 See merge request gitlab-org/gitlab-ce!17043
\| \| * \ \ \ \	[ci skip] Merge branch 'master' into 42923-close-issue	Filipa Lacerda	2018-02-13	132	-10113/+339
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (25 commits) Addressed mr observations Clean new Flash() and stop disabling no-new (eslint) when possible Disable query limiting warnings for now on GitLab.com Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" Fix warning messages for promoting labels and milestones Fixed missing js selector for the realtime pipelines commit comp Honour workhorse provided file name Create an empty wiki when there is no wiki in the gitlab export bundle Revert and remove header_title line from labels issue Fixed bug with param config changed params passed to from a string to an object Move IssuableTimeTracker vue component Fix breadcrumb on labels page for groups Convert groups_select ajax to use axios Default CI variables to unprotected make sure there is a dependency on Gitlab::CurrentSettings is Make GITLAB_FEATURES in build_spec compatible with EE Update jquery.waitforimages & use npm version Fixed typo, updated test, and removed commented code Replaced use of $.get with axios.get and updated tests ...
\| \| * \| \| \| \|	Reuse getter42923-close-issue	Filipa Lacerda	2018-02-12	6	-21/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add loading button for better UX
\| \| * \| \| \| \|	[ci skip] Merge branch 'master' into 42923-close-issue	Filipa Lacerda	2018-02-12	61	-358/+918
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP) Return a warning string if we try to encode to unsupported encoding Remove confirmation_input Resolve failures in GitHub-ish import controller specs Remove changelogs for already-released security patches Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4' Merge branch 'fix/gh-namespace-issue' into 'security-10-4' Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4' Merge branch 'fix-mermaid-xss' into 'security-10-4' Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' API - fix searching in group/project specified by path Add documentation on how to build a QA Docker image Fix english in style_guide_js.md Adds tooltip for environment name Adds CSS for child envrionments Do not attach runner to a non-exsiting network in QA Remove not needed default statement Improve docs about allowing some side effects on the constructor Move all ENV to Runtime::Env Rename .scss files to use snake_case Moves missing branch into a vue file ...
\| \| * \| \| \| \| \|	Put back class names used in shared test	Filipa Lacerda	2018-02-12	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Makes close/reopen issue request to inside the vue app	Filipa Lacerda	2018-02-09	13	-40/+206
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'sh-no-cache-populate-migration' into 'master'	Sean McGivern	2018-02-13	4	-7/+24
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable caching of tables for migration spec that drops a temporary table See merge request gitlab-org/gitlab-ce!16965
\| \| * \| \| \| \| \| \|	Fix a transient failure in ↵sh-no-cache-populate-migration	Rémy Coutable	2018-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb where symlink already exists Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Use the latest migration in ↵	Rémy Coutable	2018-02-12	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/migrations/rename_reserved_project_names_spec.rb We do that because it's using factories and it's not worth it to get rid of them. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Allow to use the latest migration in migration specs	Rémy Coutable	2018-02-12	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful for migration tests that relies on factories and that are very old and/or tedious to modify to not use factories. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Call .reset_column_in_all_models! before migrating in ↵	Rémy Coutable	2018-02-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Use the :migration metadata in migration specs	Rémy Coutable	2018-02-12	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Disable caching of tables for migration spec that drops a temporary table	Stan Hu	2018-02-12	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to fix job failures, such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51409392.
\| * \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-43193' into 'master'	Sean McGivern	2018-02-13	2	-14/+26
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500s creating merge requests with external issue tracker Closes #43193 See merge request gitlab-org/gitlab-ce!17073
\| \| * \| \| \| \| \| \| \|	Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193	Stan Hu	2018-02-12	2	-14/+26
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When JIRA or Redmine were enabled and the branch name did not match the matching regular expression, the `issue_iid` would be `nil`, preventing users from creating merge requests. Closes #43193
\| * \| \| \| \| \| \| \|	Merge branch 'winh-new-branch-dropdown-style' into 'master'	Phil Hughes	2018-02-13	10	-139/+135
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
\| \| * \| \| \| \| \| \|	Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-style	Winnie Hellmann	2018-02-12	10	-139/+135
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'jivl-update-katex' into 'master'	Clement Ho	2018-02-12	90	-9702/+55
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated katex library Closes #43032 See merge request gitlab-org/gitlab-ce!15864
\| \| * \| \| \| \| \| \| \|	Addressed mr observationsjivl-update-katex	Jose Ivan Vargas	2018-02-12	4	-19/+12
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-12	696	-4170/+16323
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-05	3112	-38931/+73844
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	removed unused imports	Jose Ivan Vargas	2017-12-21	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Removed the katex precompile steps from the application configuration	Jose Ivan Vargas	2017-12-21	2	-3/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Removed the remains of katex from vendor assets and load everything via webpack	Jose Ivan Vargas	2017-12-21	85	-1197/+37
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	added katex.js and load it via webpack	Jose Ivan Vargas	2017-12-21	6	-14423/+20
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Updated katex library	Jose Ivan Vargas	2017-12-21	83	-4778/+10717
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'andr3-clean-eslint-disables-from-board-components' into 'master'	Clement Ho	2018-02-12	3	-7/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean new Flash() and stop disabling no-new (eslint) when possible Closes #42732 See merge request gitlab-org/gitlab-ce!17060
\| \| * \| \| \| \| \| \| \| \| \|	Clean new Flash() and stop disabling no-new (eslint) when possible	André Luís	2018-02-12	3	-7/+6
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'sh-disable-query-limiter' into 'master'	Ian Baum	2018-02-12	2	-5/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable query limiting warnings for now on GitLab.com See merge request gitlab-org/gitlab-ce!17067
\| \| * \| \| \| \| \| \| \| \| \|	Disable query limiting warnings for now on GitLab.com	Stan Hu	2018-02-12	2	-5/+7
\| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'ac/4878-fix-attachments-ext' into 'master'	Nick Thomas	2018-02-12	2	-7/+11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Honour workhorse provided file name See merge request gitlab-org/gitlab-ce!17059
\| \| * \| \| \| \| \| \| \| \| \|	Honour workhorse provided file nameac/4878-fix-attachments-ext	Alessio Caiazza	2018-02-12	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the attempt to unify file uploading at workhorse level gitlab-org/gitlab-workhorse!230 we moved to a prefix-based tempfile creation in order to avoid upload collisions. Artifacts and LFS uploads already set original_filename to workhorse provided filename This commit add the same feature to `Gitlab::Middleware::Multipart`