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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fork-btn-enabled-user-groups' into 'master'	Filipa Lacerda	2017-10-04	3	-0/+100
\| \| \| \| \| \| \| \|	Fix fork button being disabled for users who can fork to group Closes #38462 See merge request gitlab-org/gitlab-ce!14551
*	Fix gitlab rake:import:repos tasksh-import-repos-fix-9-5	Stan Hu	2017-10-02	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \|	This backports !14597 for the 9.5.x branch. Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682
*	Merge branch '38319-9-5-stable' into '9-5-stable-patch-6'9-5-stable-patch-6	Jose Ivan Vargas Lopez	2017-09-28	2	-3/+78
\|\ \| \| \| \| \| \| \| \|	Handle error when fetching ref for MR with deleted source branch See merge request gitlab-org/gitlab-ce!14550
\| *	Handle error when fetching ref for MR with deleted source branch38319-9-5-stable	Sean McGivern	2017-09-28	2	-3/+78
\| \| \| \| \| \| \| \| \| \| \| \|	If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour.
* \|	Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'	Fatih Acet	2017-09-28	5	-16/+128
\|/ \| \| \| \| \| \|	Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
*	Merge branch ↵9-5-stable-patch-5	Grzegorz Bizon	2017-09-15	1	-3/+3
\| \| \| \| \| \| \| \| \|	'36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
*	Merge branch '9-5-stable' into '9-5-stable-patch-5'	Simon Knox	2017-09-16	1	-2/+19
\|\ \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| *	Add migration to fix corrupted projects	Felipe Artur	2017-09-14	1	-1/+1
\| \|
\| *	Fix project feature being deleted when updating project with invalid ↵	Felipe Artur	2017-09-12	1	-2/+19
\| \| \| \| \| \| \| \|	visibility level
* \|	Merge branch ↵	Kamil Trzciński	2017-09-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
* \|	Merge branch '36089-handle-ref-failure-better' into 'master'9-5-stable-patch-5-1	Douwe Maan	2017-09-12	16	-145/+189
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
* \|	remove tests that should have been reverted	Simon Knox	2017-09-12	1	-18/+0
\| \|
* \|	change committer back to user for spec	Simon Knox	2017-09-12	1	-3/+3
\| \| \| \| \| \| \| \|	changed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13984/
* \|	Merge branch '35804-document-table-based-tests' into 'master'	Robert Speicher	2017-09-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
* \|	Revert "Merge branch 'sidebar-cache-updates' into 'master'"	Jose Ivan Vargas	2017-09-11	2	-39/+0
\| \| \| \| \| \| \| \| \| \|	This reverts commit dd406182cb3529c3616097703b7d4dec49a3cb39, reversing changes made to d5d249764350b07340ed45068361d7249b3cf641.
* \|	Merge branch 'feature/gpg-verification-status' into 'master'	Douwe Maan	2017-09-08	11	-201/+438
\| \| \| \| \| \| \| \| \| \| \| \|	GPG signature must match the committer in order to be verified See merge request !13771
* \|	Merge branch 'perf.slow-issuable' into 'master'	Sean McGivern	2017-09-08	1	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perf.slow issuable Closes #32844 See merge request !13685
* \|	Merge branch 'sidebar-cache-updates' into 'master'	Sean McGivern	2017-09-08	2	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \|	Only update the sidebar count caches when needed See merge request !13878
* \|	Merge branch 'check-trigger-permissions-mysql' into 'master'	Douwe Maan	2017-09-08	2	-4/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve migrations using triggers Closes #36633 See merge request !13666
* \|	Merge branch 'url-sanitizer-fixes' into 'master'	Douwe Maan	2017-09-08	1	-50/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083
* \|	Merge branch '37288-fix-wrong-header-when-testing-webhook' into 'master'	Douwe Maan	2017-09-08	3	-13/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a wrong `X-Gitlab-Event` header when testing webhooks Closes #37288 See merge request !14108
* \|	Merge branch '35441-fix-division-by-zero' into 'master'	Robert Speicher	2017-09-08	1	-10/+17
\|/ \| \| \| \| \| \|	Fix division by zero for blame age map Closes #35441 See merge request !13803
*	Fixed Test for Notes Spec	Tim Zallmann	2017-09-05	1	-3/+2
\|
*	Fixes vulnerability in posting a comment in the temporary rendering	Tim Zallmann	2017-09-05	1	-0/+15
\|
*	Merge branch '9-5-stable' into 'security-9-5'	Brian Neel	2017-09-04	30	-278/+460
\|\ \| \| \| \| \| \| \| \|	Merge 9-5-stable into security-9-5 See merge request gitlab/gitlabhq!2184
\| *	Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'9-5-stable-patch-3	Sean McGivern	2017-09-02	5	-28/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve migrations / background migrations testing strategy Closes #36303 See merge request !13589
\| *	Revert "Make it possible to provide schema version in tests"	Stan Hu	2017-09-02	3	-24/+25
\| \| \| \| \| \| \| \|	This reverts commit 775cee737b585cc7fa943af21c1d09141952cbfe.
\| *	Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into ↵	Sean McGivern	2017-09-02	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Clear schema cache after running tests for migrations Closes #37086 See merge request !13870
\| *	Make it possible to provide schema version in tests	Grzegorz Bizon	2017-09-02	3	-25/+24
\| \|
\| *	Revert "Merge branch '37179-dashboard-project-dropdown' into 'master'"	Phil Hughes	2017-09-01	1	-0/+15
\| \| \| \| \| \| \| \| \| \|	This reverts commit 6d6223ecdb3b87a061aecf7b2c586cadc0f29695, reversing changes made to cc7811707424ebd58b71428c9fe27c444dd6169d.
\| *	Merge branch 'fly-out-nav-hiding-fix' into 'master'	Filipa Lacerda	2017-09-01	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the fly-out navigation flashing in & out Closes #37022 See merge request !13929
\| *	Merge branch '37202-revert-changes-to-signing-enabled' into 'master'	Douwe Maan	2017-09-01	4	-18/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rollback changes made to signing_enabled. Closes #37202 See merge request !13956
\| *	Merge branch 'issue_36820' into 'master'	Sean McGivern	2017-09-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove closing external issues by reference error Closes #36820 See merge request !13910
\| *	Merge branch 'rs-remove-filtered-issues-skips' into 'master'	Douwe Maan	2017-09-01	1	-50/+0
\| \| \| \| \| \| \| \| \| \|	Remove skipped examples in filtered issues feature spec See merge request !13845
\| *	Merge branch 'fix/import-events' into 'master'	Sean McGivern	2017-09-01	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix events error importing GitLab projects Closes #36965 See merge request !13868
\| *	Merge branch '37179-dashboard-project-dropdown' into 'master'	Phil Hughes	2017-09-01	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes disabled state from projects dropdown in dashboard page Closes #37179 See merge request !13933
\| *	Merge branch 'fly-out-nav-jump-fix' into 'master'	Tim Zallmann	2017-09-01	1	-25/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fly-out nav jumping Closes #36699 See merge request !13690
\| *	Merge branch 'changes-bar-sticky-fix' into 'master'	Filipa Lacerda	2017-09-01	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the diff changes buttons from toggling when scrolling Closes #36698 See merge request !13894
\| *	Merge branch 'mk-fix-user-namespace-rename' into 'master'	Douwe Maan	2017-09-01	3	-3/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make username update fail if namespace update fails Closes gitlab-com/support-forum#2316 See merge request !13642
\| *	Merge branch 'fix-flakes' into 'master'	Robert Speicher	2017-09-01	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix transient dropdown test failures Closes #37052 and #34436 See merge request !13862
\| *	Merge branch ↵	Kamil Trzciński	2017-09-01	2	-15/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1' into 'master' Fix pipeline trigger via API fails with 500 Internal Server Error in 9.5.1 Closes #37040 See merge request !13861
\| *	Merge branch 'gitaly-9-5-2-patch' into '9-5-stable-patch-3'	Robert Speicher	2017-09-01	4	-36/+50
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Gitlab::Git::Commit to include a repository and add missing specs See merge request !13815
\| \| *	Add spec for Gitlab::Git::Commit#rugged_commitgitaly-9-5-2-patch	Alejandro Rodríguez	2017-08-24	1	-0/+11
\| \| \|
\| \| *	Refactor Gitlab::Git::Commit to include a repository	Alejandro Rodríguez	2017-08-24	4	-36/+39
\| \| \|
\| * \|	Merge branch 'fly-out-tunnel' into 'master'	Filipa Lacerda	2017-09-01	1	-40/+151
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dynamic navigation tunnel to fly-out menus Closes #35949 See merge request !13315
\| * \|	Merge branch 'backstage/gb/optimize-notification-specs' into 'master'	Robert Speicher	2017-09-01	2	-67/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize notification emails specs See merge request !13986
\| * \|	Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'	Robert Speicher	2017-09-01	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve flaky ACE editor spec See merge request !13854
\| * \|	Merge branch 'sh-simplify-system-hook-testing' into 'master'	Douwe Maan	2017-09-01	1	-27/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify system hook testing and guarantee test will fire Closes #37067 See merge request !13858
\| * \|	Merge branch 'bugfix.notify-custom-participants' into 'master'	Sean McGivern	2017-09-01	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bugfix.notify custom participants Closes #36610 See merge request !13680
\| * \|	Merge branch '36860-deleted-user-fix' into 'master'	Sean McGivern	2017-09-01	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failure when issue author is nil See merge request !13807