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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-api	Robert Speicher	2016-03-09	5	-0/+24
\| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53.
*	Merge branch 'retry-bundle' into 'master'	Kamil Trzciński	2016-03-09	2	-13/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Retry bundler and apt-get See merge request !3146
\| *	Retry bundler and apt-getretry-bundle	Kamil Trzcinski	2016-03-09	2	-13/+15
\| \|
* \|	Merge branch 'fix-git-push-service-specs' into 'master'	Robert Speicher	2016-03-09	2	-7/+13
\|\ \ \| \|/ \|/\| \| \| \| \|	Fixed the GitPushService specs See merge request !3139
\| *	Handle permissions for ExternalIssue instancesfix-git-push-service-specs	Yorick Peterse	2016-03-09	2	-2/+7
\| \| \| \| \| \| \| \|	This fixes the remainder of the GitPushService specs.
\| *	Fixed part of the GitPushService specs	Yorick Peterse	2016-03-09	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \|	These were broken by commit 21a05328ffd5cb9130ae516faa7dd672cacba90c. Two JIRA tests remain broken but I can't quite figure out how to fix them.
* \|	Merge branch 'rs-sprite-task' into 'master'	Dmitriy Zaporozhets	2016-03-09	1	-0/+121
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `gemojione:sprite` Rake task This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. See merge request !3130
\| * \|	Add a `gemojione:sprite` Rake task	Robert Speicher	2016-03-09	1	-0/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. [ci skip]
* \| \|	Merge branch 'fix-todos' into 'master'	Douglas Barbosa Alexandre	2016-03-09	7	-3/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141
\| * \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-03-09	1	-1/+2
\| \| \| \|
\| * \| \|	Avoid error 500 when todo author was removed	Douglas Barbosa Alexandre	2016-03-09	2	-2/+5
\| \| \| \|
\| * \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-03-09	1	-0/+3
\| \| \| \|
\| * \| \|	Remove invalid todos from database	Douglas Barbosa Alexandre	2016-03-09	2	-1/+17
\| \| \| \|
\| * \| \|	Destroy all related todos when removing a project	Douglas Barbosa Alexandre	2016-03-09	2	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'snippet-visibility-spacing' into 'master'	Jacob Schatz	2016-03-09	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snippet visibility badge spacing Closes #14074 ![Screen_Shot_2016-03-08_at_08.40.32](/uploads/f55ca724fbf0e247b299a2702c3b55f5/Screen_Shot_2016-03-08_at_08.40.32.png) See merge request !3122
\| * \| \| \|	Snippet visibility badge spacingsnippet-visibility-spacing	Phil Hughes	2016-03-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14074
* \| \| \| \|	Merge branch 'commit-limits' into 'master'	Jacob Vosmaer	2016-03-09	4	-6/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit limits Prevent timeouts when creating/viewing Merge Requests with many commits. Also, reduce the number of commits shown in the UI from 500 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14031 This MR avoids Unicorn timeouts in some places and takes 4.5 seconds off load times in others, when manually testing with a 4500-commit compare/MR in the linux repo. It does not limit the number of Commit objects instantiated in memory, just the amount of HTML generated. It seems that having 4500 commits objects is not a problem in itself. If it ever becomes one we could do something for Commit objects like we did for Diff (introduce a CommitCollection or something). See merge request !3095
\| * \| \| \| \|	Prevent performance issuescommit-limits	Jacob Vosmaer	2016-03-09	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Change "some commits hidden" message	Jacob Vosmaer	2016-03-07	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Finish refactor	Jacob Vosmaer	2016-03-07	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove outdated comment	Jacob Vosmaer	2016-03-04	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Put 'hidden commits' logic in CommitsHelper	Jacob Vosmaer	2016-03-04	3	-12/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Limit the number of commits shown in MRs	Jacob Vosmaer	2016-03-04	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents timeouts when creating a MR with 1000s of commits.
\| * \| \| \| \|	Show at most 100 commits in the web UI	Jacob Vosmaer	2016-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When rendering 1 commit takes over 5ms (on my laptop: around 9ms), it saves seconds in rendering time to show 100 instead of 500 commits.
* \| \| \| \| \|	Merge branch 'rs-bump-poltergeist' into 'master'	Dmitriy Zaporozhets	2016-03-09	2	-3/+3
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump poltergeist to `~> 1.9.0` See merge request !3116
\| * \| \| \| \|	Bump poltergeist to `~> 1.9.0`rs-bump-poltergeist	Robert Speicher	2016-03-07	2	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'retry-tests' into 'master'	Kamil Trzciński	2016-03-09	8	-36/+83
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retry failed tests This is to make the CI builds more reliable due to large amount of timeouts and deadlocks recently. See merge request !1793
\| * \| \| \| \|	Fix script error	Kamil Trzcinski	2016-03-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Retry apt-get installation and bundle install	Kamil Trzcinski	2016-03-09	2	-8/+20
\| \| \| \| \| \|
\| * \| \| \| \|	Retry spinach tests	Kamil Trzcinski	2016-03-09	5	-28/+53
\| \| \| \| \| \|
\| * \| \| \| \|	Retry failed tests	Kamil Trzcinski	2016-03-09	4	-0/+10
\|/ / / / /
* \| \| \| \|	Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master'	Rémy Coutable	2016-03-09	3	-1/+90
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where Bitbucket 'closed' issues were imported as 'opened' _Originally opened at !2930 by @iurisilvio._ - - - Bitbucket has an undocumented status `closed`. https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html Related to https://gitlab.com/gitlab-com/support-forum/issues/559 See merge request !2973
\| * \| \| \| \|	Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closed	Iuri de Silvio	2016-03-07	3	-1/+90
\| \|/ / / /
* \| \| \| \|	Merge branch 'update-db-schema' into 'master'	Yorick Peterse	2016-03-09	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !3136
\| * \| \| \| \|	Added main_language to the schema	Yorick Peterse	2016-03-09	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This wasn't included in gitlab-org/gitlab-ce!3000.
* \| \| \| \|	Merge branch 'fix/upgrader-docs' into 'master'	Achilleas Pipinellis	2016-03-09	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix master branch link to upgrader.md See merge request !2967
\| * \| \| \| \|	Fix URL to upgrader guide	Jonas Friedmann	2016-03-09	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-03-09	21	-69/+42
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'rs-traits-are-good' into 'master'	Dmitriy Zaporozhets	2016-03-09	8	-36/+32
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make better use of the `visibility_level` factory traits See merge request !3131
\| \| * \| \| \| \| \|	Make better use of the `visibility_level` factory traitsrs-traits-are-good	Robert Speicher	2016-03-08	5	-20/+19
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Simplify the various Snippet factories	Robert Speicher	2016-03-08	3	-16/+13
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'rs-snippets-dont-expire' into 'master'	Dmitriy Zaporozhets	2016-03-09	13	-33/+10
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
\| \| * \| \| \| \| \|	Remove `Snippet#expires_at`rs-snippets-dont-expire	Robert Speicher	2016-03-05	13	-33/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years.
* \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2016-03-09	2	-2/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'security_bug_fix_close_issue' into 'master'	Douwe Maan	2016-03-05	2	-2/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Security] Automatic issue closing Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2640 See merge request !1944
\| \| * \| \| \| \| \| \|	Security: Fix issue auto closing	Valery Sizov	2016-03-03	2	-2/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve-archived-projects'	Dmitriy Zaporozhets	2016-03-09	16	-69/+93
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Updated project list dropdown to use dropdown classesimprove-archived-projects	Phil Hughes	2016-03-05	2	-32/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Align projects sort checkbox	Dmitriy Zaporozhets	2016-03-04	2	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Fix test	Dmitriy Zaporozhets	2016-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>