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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-check	Rémy Coutable	2017-05-16	1	-3/+5
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'ee_compat_check-include-git-apply-reject-suggestion' into ↵	Rémy Coutable	2017-05-16	1	-0/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update ee_compat_check.rb to include `git apply --reject` suggestion See merge request !11321
\| *	Update ee_compat_check.rb to include `git apply --reject` suggestion	Luke "Jared" Bennett	2017-05-16	1	-0/+11
\|/
*	Merge branch '30827-changes-to-audit-log' into 'master'	Phil Hughes	2017-05-16	9	-12/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Rename Personal Audit Log Closes #30827 See merge request !11400
\| *	Rename Personal Audit Log	Tim Zallmann	2017-05-16	9	-12/+17
\|/
*	Merge branch 'add-right-margin-to-ci-error-icon' into 'master'	Fatih Acet	2017-05-16	2	-1/+5
\|\ \| \| \| \| \| \| \| \|	Added ci-error class and applied a right margin to the ci error widget state See merge request !11353
\| *	Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-icon	Luke "Jared" Bennett	2017-05-13	2	-1/+5
\| \|
* \|	Merge branch '32033-fix-login-usernamelabel' into 'master'	Tim Zallmann	2017-05-16	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""Username or email" label on login form does not point to its corresponding input field" Closes #32033, #31709, and #32034 See merge request !11292
\| * \|	Resolve ""Username or email" label on login form does not point to its ↵	Tim Zallmann	2017-05-16	2	-3/+3
\|/ / \| \| \| \| \| \|	corresponding input field"
* \|	Merge branch 'winh-autocomplete-error' into 'master'	Phil Hughes	2017-05-16	5	-54/+76
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace broken autocomplete field for new tags with dropdown Closes #32127 See merge request !11290
\| * \|	Replace broken autocomplete field for new tags with dropdown	Winnie Hellmann	2017-05-16	5	-54/+76
\|/ /
* \|	Merge branch '32303-nav-z-index' into 'master'	Fatih Acet	2017-05-16	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add higher z-index to fixed nav Closes #32303 See merge request !11393
\| * \|	Add higher z-index to fixed nav32303-nav-z-index	Annabel Dunstone Gray	2017-05-15	1	-0/+1
\| \| \|
* \| \|	Merge branch 'spec-joining-it' into 'master'	Rémy Coutable	2017-05-16	4	-30/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Spec optimization] Joining one-line 'it' blocks See merge request !11372
\| * \| \|	[Spec optimization] Joining one-line 'it' blocksspec-joining-it	Valery Sizov	2017-05-15	4	-30/+46
\| \| \| \|
* \| \| \|	Merge branch '32125-fix-link-to-note-in-diff' into 'master'	Fatih Acet	2017-05-16	4	-62/+91
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix linking to resolved note in diff Closes #32125 See merge request !11327
\| * \| \| \|	Fix linking to resolved note in diff32125-fix-link-to-note-in-diff	Eric Eastwood	2017-05-12	4	-62/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
* \| \| \| \|	Merge branch 'zj-pipeline-schedule-owner' into 'master'	Kamil Trzciński	2017-05-16	7	-21/+92
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Foreign key for Pipeline schedule owner Closes #31932 See merge request !11233
\| * \| \| \| \|	Add foreign key on pipeline_schedules.owner_idzj-pipeline-schedule-owner	Z.J. van de Weg	2017-05-15	2	-1/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set to nullify, so the settings remain if the user is deleted. Fixes gitlab-org/gitlab-ce#31932
\| * \| \| \| \|	Do not schedule pipelines if the user can't	Z.J. van de Weg	2017-05-15	5	-20/+55
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the owner of a pipelines schedule was either blocked or was removed from the project, the pipeline schedular would still schedule the pipeline. This would than fail however, given the user had no access to the project and it contents. However, a better way to handle it would be to not schedule it at all. Furthermore, from now on, such schedules will be deactivated so the schedule worker can ignore it on the next runs.
* \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-05-16	3	-3/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache' into 'master' Resolve "Speed up `yarn install` in CI by utilizing inter-pipeline cache" Closes #32219 See merge request !11343
\| * \| \| \| \|	alter cache key to prevent other pipeline configs from overwriting32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache	Mike Greiling	2017-05-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	add CHANGELOG.md entry for !11343	Mike Greiling	2017-05-16	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	add trailing slash to .yarn-cache to clearly identify it as a directory	Mike Greiling	2017-05-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	instruct yarn to utilize the persistant .yarn-cache directory	Mike Greiling	2017-05-16	2	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '24373-warning-message-go-away' into 'master'	Phil Hughes	2017-05-16	3	-3/+49
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes warning message should go away once resolved Closes #24373 See merge request !10823
\| * \| \| \| \| \|	Notes: Warning message should go away once resolved	Jacopo	2017-05-15	3	-3/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flash error messages disappear(`fadeOut`) automatically after any successful request
* \| \| \| \| \| \|	Merge branch '32231-fix-transient-failure-of-deployment-query-spec' into ↵	Robert Speicher	2017-05-16	1	-10/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix transient failure of deployment query spec Closes #32231 See merge request !11371
\| * \| \| \| \| \| \|	Due to DB rounding timestamp to 1s resolution - freeze date on non ↵	Pawel Chojnacki	2017-05-15	1	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fractional time
* \| \| \| \| \| \| \|	Merge branch 'issue-boards-label-filtering' into 'master'	Filipa Lacerda	2017-05-16	2	-1/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue boards not filtering when URL params are encoded Closes #32084 See merge request !11320
\| * \| \| \| \| \| \| \|	Fixed tests with params being wrongissue-boards-label-filtering	Phil Hughes	2017-05-15	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed issue boards not filtering when URL params are encoded	Phil Hughes	2017-05-12	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #32084
* \| \| \| \| \| \| \| \|	Merge branch '31898-pipeline-table-alignment' into 'master'	Filipa Lacerda	2017-05-16	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra pipeline margin Closes #31898 See merge request !11255
\| * \| \| \| \| \| \| \| \|	Remove extra pipeline margin31898-pipeline-table-alignment	Annabel Dunstone Gray	2017-05-10	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '29421-production-config-assets-compile-false' into 'master'	Stan Hu	2017-05-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set 'config.assets.compile = false' in production Closes #29421 See merge request !9917
\| * \| \| \| \| \| \| \| \| \|	Set 'config.assets.compile = false' in production29421-production-config-assets-compile-false	James Edwards-Jones	2017-03-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-rename-column-concurrently-with-null' into 'master'	Yorick Peterse	2017-05-15	2	-3/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow NULL on renamed column after default has been set See merge request !11396
\| * \| \| \| \| \| \| \| \| \| \|	Disallow NULL on renamed column after default has been set	Douwe Maan	2017-05-15	2	-3/+6
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'omega-submodules' into 'master'	Robert Speicher	2017-05-15	3	-0/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omega submodules See merge request !10797
\| * \| \| \| \| \| \| \| \| \| \|	submodule_links: Handle in-repository submodule urls	David Turner	2017-05-15	3	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes it is useful to store submodules in the same repository which contains links to them. Make the UI support this. See https://github.com/twosigma/git-meta/wiki/The-Omega-Repo for information about this strategy Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31902-namespace-recent-searches-to-project' into 'master'	Annabel Dunstone Gray	2017-05-15	6	-25/+52
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scope recent searches to project Closes #31902 See merge request !11142
\| * \| \| \| \| \| \| \| \| \| \| \|	Scope recent searches to project	Eric Eastwood	2017-05-15	6	-25/+52
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'revert-0663458c' into 'master'	Douwe Maan	2017-05-15	25	-125/+121
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" See merge request !11395
\| * \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"	Douwe Maan	2017-05-15	25	-125/+121
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !11287
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'use-gitaly-migrate' into 'master'	Douwe Maan	2017-05-15	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly_migrate helper on all current migrations in repository See merge request !11309
\| * \| \| \| \| \| \| \| \| \| \|	Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrate	Alejandro Rodríguez	2017-05-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31106-tabs-alignment' into 'master'	Annabel Dunstone Gray	2017-05-15	7	-55/+82
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix Resolved Discussions counter wrapping to next line Closes #31106 See merge request !10775
\| * \| \| \| \| \| \| \| \| \| \|	fix Resolved Discussions counter wrapping to next line	Simon Knox	2017-05-13	7	-55/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rename-rendered_title' into 'master'	Rémy Coutable	2017-05-15	7	-11/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename all references to rendered_title to realtime_changes See merge request !11359
\| * \| \| \| \| \| \| \| \| \| \| \|	Rename all references to rendered_title to realtime_changesrename-rendered_title	Luke "Jared" Bennett	2017-05-13	7	-11/+11
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|