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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requested	Sean McGivern	2017-08-21	5	-19/+44
\| \| \| \| \| \| \| \| \|	This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a side-effect: when we haven't enabled job throttling, it will still hit Redis a lot (and miss, because nothing is configured). As this setting already required a restart, ensure that the library is only required when it's enabled.
*	Merge branch '35343-inherit-milestones-and-labels' into 'master'	Sean McGivern	2017-08-21	3	-3/+27
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	copy milestones and labels from issue when using create merge request button Closes #35343 See merge request !13461
\| *	[skip ci] changelog and minor style changes added	haseeb	2017-08-18	3	-3/+8
\| \|
\| *	moved merge parms to service	haseeb	2017-08-17	3	-33/+17
\| \|
\| *	tests for inheriting milestones and labels	haseeb	2017-08-11	1	-1/+26
\| \|
\| *	working version of create merge requests with labels	haseeb	2017-08-10	2	-4/+12
\| \|
\| *	copy milestones from issue when using create merge request btn	haseeb	2017-08-10	2	-2/+4
\| \|
* \|	Merge branch 'issue_20900_remove_ignore_columns' into 'master'	Sean McGivern	2017-08-21	2	-4/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Issue 20900 remove ignore columns See merge request !12166
\| * \|	Remove ignore columns	Felipe Artur	2017-08-18	2	-4/+0
\| \| \|
* \| \|	Merge branch '36458-user-profile-activity-feed-contains-broken-image-links' ↵	Phil Hughes	2017-08-21	2	-1/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "User profile activity feed contains broken image links" Closes #36458 See merge request !13606
\| * \| \|	Resolve "User profile activity feed contains broken image links"	Tim Zallmann	2017-08-21	2	-1/+7
\|/ / /
* \| \|	Merge branch 'rouge-2.2.0' into 'master'	Sean McGivern	2017-08-21	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rouge to 2.2.0 Closes #36554 See merge request !13633
\| * \| \|	Bump rouge to v2.2.0	pbr	2017-08-19	2	-1/+6
\| \| \| \|
* \| \| \|	Merge branch 'rs-git-access-spec-speed' into 'master'	Douwe Maan	2017-08-21	2	-142/+126
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Greatly reduce test duration for git_access_spec See merge request !13675
\| * \| \| \|	Reduce duplication in GitAccess spec around error messagesrs-git-access-spec-speed	Robert Speicher	2017-08-18	2	-44/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds a new `ProjectMovedError` class to encapsulate that error condition. Inherits from `NotFoundError` so existing rescues should continue to work. - Separating that condition out of `NotFoundError` allowed us to simplify the `raise_not_found` helper and avoid repeating the literal string. - Spec makes use of `ERROR_MESSAGES` hash to avoid repeating literal error message strings.
\| * \| \| \|	Greatly reduce test duration for git_access_spec	Robert Speicher	2017-08-18	1	-111/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Combine multiple `it` blocks into one where it made sense - Use `set` for the top-level User record - Refactor permission matrix tests
* \| \| \| \|	Merge branch 'mk-fix-user-namespace-rename' into 'master'	Douwe Maan	2017-08-21	5	-4/+87
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make username update fail if namespace update fails Closes gitlab-com/support-forum#2316 See merge request !13642
\| * \| \| \| \|	Add namespace errors from User#after_updatemk-fix-user-namespace-rename	Michael Kozono	2017-08-18	3	-3/+26
\| \| \| \| \| \|
\| * \| \| \| \|	Fix spec	Michael Kozono	2017-08-17	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog entry	Michael Kozono	2017-08-17	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Make username update fail if namespace part fails	Michael Kozono	2017-08-17	2	-1/+57
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-broken-yarn-deps' into 'master'	Tim Zallmann	2017-08-21	4	-395/+516
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken Yarn dependencies Closes #33886 and #34944 See merge request !13614
\| * \| \| \| \| \|	switch from --pure-lockfile to --frozen-lockfile to ensure failure if we ↵fix-broken-yarn-deps	Mike Greiling	2017-08-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	have a bad lock file
\| * \| \| \| \| \|	refresh sub-dependencies of node scripts to latest versions	Mike Greiling	2017-08-18	2	-257/+403
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix more node deps	Mike Greiling	2017-08-18	1	-16/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	dedupe node dependencies	Mike Greiling	2017-08-18	1	-30/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove zopfli compression temporarily until a better solution is found	Mike Greiling	2017-08-18	3	-171/+26
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	bump fsevents dependency to version that supports node 8	Mike Greiling	2017-08-18	1	-12/+167
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '36517-failing-karma-tests-for-chrome-60' into 'master'	Tim Zallmann	2017-08-21	3	-3/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Failing karma tests for Chrome 60" Closes #36517 See merge request !13646
\| * \| \| \| \| \|	update karma CI build image to Chrome 6036517-failing-karma-tests-for-chrome-60	Mike Greiling	2017-08-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix test failures in text_utility_spec.js on Chrome 60	Mike Greiling	2017-08-18	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix test failures in board_new_issue_spec.js on Chrome 60	Mike Greiling	2017-08-17	1	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'remove-user-bundle' into 'master'	Tim Zallmann	2017-08-21	1	-1/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove superfluous users bundle See merge request !13684
\| * \| \| \| \| \| \|	remove superfluous users bundleremove-user-bundle	Mike Greiling	2017-08-18	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue-boards-closed-shows-empty-label' into 'master'	Tim Zallmann	2017-08-21	2	-1/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue boards closed list displaying empty label Closes #36650 See merge request !13658
\| * \| \| \| \| \| \| \|	Fixed issue boards closed list displaying empty labelissue-boards-closed-shows-empty-label	Phil Hughes	2017-08-18	2	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36650
* \| \| \| \| \| \| \| \|	Merge branch 'docs/gpg-refactor' into 'master'	Marcia Ramos	2017-08-21	15	-87/+249
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor GPG docs See merge request !13660
\| * \| \| \| \| \| \| \| \|	Add more sections in GPG docsdocs/gpg-refactor	Achilleas Pipinellis	2017-08-19	2	-21/+173
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Generating a GPG key 1. Signing commits 1. Associating a GPG key with Git
\| * \| \| \| \| \| \| \| \|	Refactor GPG signing docs	Achilleas Pipinellis	2017-08-18	4	-31/+40
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change GPG docs location	Achilleas Pipinellis	2017-08-18	11	-4/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-create-project-getting-started' into 'master'	Achilleas Pipinellis	2017-08-20	2	-10/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Create Project Getting Started See merge request !13687
\| * \| \| \| \| \| \| \| \| \|	Update Create Project Getting Started	Fabio Busatto	2017-08-20	2	-10/+7
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-protected-tags-delete' into 'master'	Yorick Peterse	2017-08-20	3	-2/+42
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500s when attempting to destroy a protected tag Closes #36013 See merge request !13692
\| * \| \| \| \| \| \| \| \| \|	Fix Error 500s when attempting to destroy a protected tag	Stan Hu	2017-08-20	3	-2/+42
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a missing `on_delete: :cascade`, users would hit the error that looked like: ``` PG::ForeignKeyViolation: ERROR: update or delete on table "protected_tags" violates foreign key constraint "fk_rails_f7dfda8c51" on table "protected_tag_create_access_levels" DETAIL: Key (id)=(1385) is still referenced from table "protected_tag_create_access_levels". : DELETE FROM "protected_tags" WHERE "protected_tags"."id" = 1385 ``` Closes #36013
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-filtered-search-dropdowns' into 'master'	Clement Ho	2017-08-18	3	-12/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make issuable filter dropdown style consistent See merge request !13421
\| * \| \| \| \| \| \| \| \| \|	Make issuable filter dropdown style consistent	Winnie Hellmann	2017-08-18	3	-12/+20
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'repo-template-format-repo' into 'master'	Clement Ho	2017-08-18	1	-3/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct repo.vue template Closes #36415 See merge request !13452
\| * \| \| \| \| \| \| \| \| \|	Correct repo.vue template	Luke "Jared" Bennett	2017-08-18	1	-3/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-commit-cache-i18n' into 'master'	Robert Speicher	2017-08-18	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add current locale to commit partial cache key Closes #36591 See merge request !13669
\| * \| \| \| \| \| \| \| \| \|	Describe what, not how, in changelog.dm-commit-cache-i18n	Douwe Maan	2017-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]