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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make parent_id field integer/null value instead of stringupdate-namespaces-api-docs	Tomasz Maczukin	2018-02-13	1	-5/+5
\|
*	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`
* \| \| \| \| \| \|	Merge branch 'jivl-fix-warning-messages-labels-milestones' into 'master'43024-links-in-issue-board-are-broken	Clement Ho	2018-02-12	3	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix warning messages for promoting labels and milestones Closes #42900 See merge request gitlab-org/gitlab-ce!17063
\| * \| \| \| \| \| \|	Fix warning messages for promoting labels and milestones	Jose Ivan Vargas	2018-02-12	3	-3/+3
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Ian Baum	2018-02-12	6	-113/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master' Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" See merge request gitlab-org/gitlab-ce!17062
\| * \| \| \| \| \| \|	Revert "Merge branch ↵rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key	Rubén Dávila	2018-02-12	6	-113/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
* \| \| \| \| \| \| \|	Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'	Filipa Lacerda	2018-02-12	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed missing js selector for the realtime pipelines commit component See merge request gitlab-org/gitlab-ce!17061
\| * \| \| \| \| \| \| \|	Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipeline	Jose Ivan Vargas	2018-02-12	2	-2/+2
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'groups-select-axios' into 'master'	Filipa Lacerda	2018-02-12	1	-11/+11
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert groups_select ajax to use axios See merge request gitlab-org/gitlab-ce!17041
\| * \| \| \| \| \| \|	Convert groups_select ajax to use axiosgroups-select-axios	Phil Hughes	2018-02-09	1	-11/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '40994-fix-ee-ce-compatible-test' into 'master'	Kamil Trzciński	2018-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make GITLAB_FEATURES in build_spec compatible with EE Closes #40994 See merge request gitlab-org/gitlab-ce!17023
\| * \| \| \| \| \| \|	Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-test	Dylan Griffith	2018-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Right now this fails in EE since the EE codebase defaults to having a starter license which means there are features in this value. This seems to be incompatible with the statement that tests should behave the same in CE as EE but I think that since there is a before on all EE specs creating a starter license it unfortunately does not behave that way. This is needed for #40994 and fixes the failing specs in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4393
* \| \| \| \| \| \| \|	Merge branch '4826-geo-wikisyncservice-attempts-to-sync-projects' into 'master'	Nick Thomas	2018-02-12	4	-2/+76
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create an empty wiki when there is no wiki in the gitlab export bundle See merge request gitlab-org/gitlab-ce!17010
\| * \| \| \| \| \| \| \|	Create an empty wiki when there is no wiki in the gitlab export bundle	Valery Sizov	2018-02-12	4	-2/+76
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'group-label-page-breadcrumb' into 'master'	Phil Hughes	2018-02-12	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix breadcrumb on labels page for groups Closes #42909 See merge request gitlab-org/gitlab-ce!17045
\| * \| \| \| \| \| \| \|	Revert and remove header_title line from labels issue	Onuwa Nnachi Isaac	2018-02-12	3	-2/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix breadcrumb on labels page for groups	Onuwa Nnachi Isaac	2018-02-09	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master'	Phil Hughes	2018-02-12	3	-28/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced use of $.get with axios.get and updated tests See merge request gitlab-org/gitlab-ce!16989
\| * \| \| \| \| \| \| \| \|	Fixed bug with param configdiff-and-gpg-badges-ajax-refactor	Constance Okoghenun	2018-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	changed params passed to from a string to an object	Constance Okoghenun	2018-02-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed typo, updated test, and removed commented code	Constance Okoghenun	2018-02-08	3	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Replaced use of $.get with axios.get and updated tests	Constance Okoghenun	2018-02-08	3	-28/+46
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bw-fix-autoload-issue' into 'master'	Rémy Coutable	2018-02-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue with Gitlab::CurrentSettings and autoload/spring system Closes gitlab-ee#4842 See merge request gitlab-org/gitlab-ce!17037
\| * \| \| \| \| \| \| \| \|	make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issue	Brett Walker	2018-02-09	1	-0/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes an issue where the Rails autoload system would throw various `Unable to autoload constant` errors (such as `Unable to autoload constant EE::ProjectsHelper`) when using the autoload system (such with `spring` or `reload!` in the rails console. This error was specifically ocurring in the EE code, however, it's seems reasonable to place the fix in CE as a general innoculation.
* \| \| \| \| \| \| \| \|	Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'	Filipa Lacerda	2018-02-12	4	-75/+85
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move IssuableTimeTracker vue component See merge request gitlab-org/gitlab-ce!16948