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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add CHANGELOG and testlogged-out-search	Dmitriy Zaporozhets	2016-03-01	3	-0/+32
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Enable search for logged-out users	Dmitriy Zaporozhets	2016-03-01	6	-6/+22
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'mr-prefix-activity-view' into 'master'	Jacob Schatz	2016-03-01	6	-6/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed # to ! on merge requests on activity view Closes #9082 ![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png) See merge request !2938
\| *	Changed page title	Phil Hughes	2016-03-01	1	-1/+1
\| \|
\| *	Fixed issue based on feedback with link text output	Phil Hughes	2016-03-01	1	-1/+1
\| \|
\| *	Removed un-used variables	Phil Hughes	2016-03-01	2	-3/+1
\| \|
\| *	Replaced prefix with to_reference method calls	Phil Hughes	2016-03-01	5	-11/+7
\| \|
\| *	Changed # to ! on merge requests on activity view	Phil Hughes	2016-03-01	4	-5/+12
\| \| \| \| \| \| \| \|	Closes #9082
* \|	Merge branch 'comment-batch-size' into 'master'	Douwe Maan	2016-03-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Batch size >1000 does not pay off We did a small experiment to see how a full scan of the Redis keys on gitlab.com speeds up as we increase the batch size. The values on the right are time in seconds for a full scan (no delete operations). ``` count: 10); 284.500529021 count: 100); 86.21216934 count: 1_000); 60.931676195 count: 10_000); 60.96355610 count: 100_000); 62.378172541 ``` It looks like 1,000 is a good number. See merge request !2970
\| * \|	Batch size >1000 does not pay offcomment-batch-size	Jacob Vosmaer	2016-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We did a small experiment to see how a full scan of the Redis keys on gitlab.com speeds up as we increase the batch size. The values on the right are time in seconds for a full scan (no delete operations). count: 10); 284.500529021 count: 100); 86.21216934 count: 1_000); 60.931676195 count: 10_000); 60.96355610 count: 100_000); 62.378172541 It looks like 1,000 is a good number.
* \| \|	Merge branch 'safe-content-type' into 'master'	Douwe Maan	2016-03-01	3	-12/+23
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain why we mangle blob content types Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079 See merge request !2956
\| * \|	Explain why we mangle blob content typessafe-content-type	Jacob Vosmaer	2016-02-24	3	-12/+23
\| \| \|
* \| \|	Merge branch 'rs-update-rails' into 'master'	Dmitriy Zaporozhets	2016-03-01	2	-31/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Rails to 4.2.5.2 See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ See merge request !3019
\| * \| \|	Update Rails to 4.2.5.2	Robert Speicher	2016-02-29	2	-31/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ
* \| \| \|	Merge branch 'issue_13851' into 'master'	Rémy Coutable	2016-03-01	1	-1/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989
\| * \| \| \|	Bring back Gitlab textissue_13851	Alfredo Sumaran	2016-02-29	1	-1/+14
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/contributions-forked-projects' into 'master'	Douwe Maan	2016-03-01	3	-1/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include contributions from forked projects on profile calendar Shows contributions from forked projects in the calendar Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3612 See merge request !2918
\| * \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-29	194	-865/+5348
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/contributions-forked-projects
\| * \| \| \| \| \|	include contributions from forked projects on profile calendar	James Lopez	2016-02-22	3	-1/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'feature/slacky-builds-v2' into 'master'	James Lopez	2016-03-01	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commit message to slack script Ass suggested by @rdavila, this adds the current commit message as of HEAD to the slack script. See merge request !3027
\| * \| \| \| \| \| \|	fix syntax error	James Lopez	2016-03-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added commit message to slack script	James Lopez	2016-03-01	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'triggers_link' into 'master'	Achilleas Pipinellis	2016-03-01	1	-1/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to triggers doc in variables section Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13901 See merge request !3025
\| * \| \| \| \| \|	Add link to triggers doc in variables section	Achilleas Pipinellis	2016-03-01	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'issue_13212' into 'master'	Jacob Schatz	2016-02-29	3	-1/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes padding loss after editing a diff comment Also applies .timeago() to comment datetimes when diff page is entered directly. Also fixes the vertical position of the comment count icon. See merge request !3012
\| * \ \ \ \ \ \	Merge branch 'master' into issue_13212issue_13212	Alfredo Sumaran	2016-02-29	56	-185/+688
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Comment icon vertically aligned	Alfredo Sumaran	2016-02-29	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Wrap icon with edited time	Alfredo Sumaran	2016-02-29	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Increase padding	Alfredo Sumaran	2016-02-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Keep edited time on the same line as well	Alfredo Sumaran	2016-02-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply nice date when diff page loads	Alfredo Sumaran	2016-02-29	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Keep date in the same line	Alfredo Sumaran	2016-02-29	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prevent content misalignment	Alfredo Sumaran	2016-02-29	1	-0/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'revert-6f85eb38' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-4/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'issue_5854' into 'master'" This reverts merge request !2992 cc @rdavila See merge request !3013
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38	Dmitriy Zaporozhets	2016-02-29	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !2992
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/project-wiki-ending' into 'master'	Robert Speicher	2016-02-29	3	-3/+23
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for project paths ending in .wiki This prevents `Git operation was rejected by pre-receive hook` when an actual project ending with .wiki is thought to be a wiki by the `Internal` API. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13742 See merge request !2960
\| * \| \| \| \| \| \| \| \|	fixed merge conflict and refactored specs	James Lopez	2016-02-29	1	-6/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-29	81	-378/+4091
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/project-wiki-ending
\| * \| \| \| \| \| \| \| \| \|	updated internal.rb and spec based on MR feedback	James Lopez	2016-02-26	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix changelog [ci skip]	James Lopez	2016-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-24	13	-44/+71
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/project-wiki-ending
\| * \| \| \| \| \| \| \| \| \| \|	added changelog	James Lopez	2016-02-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix for projects ending in .wiki	James Lopez	2016-02-24	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_5854' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commit message to JIRA's notification payload. Closes #5854 See merge request !2992
\| * \| \| \| \| \| \| \| \| \| \|	Add commit message to JIRA's notification payload.	Rubén Dávila	2016-02-26	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_13648' into 'master'	Dmitriy Zaporozhets	2016-02-29	2	-14/+22
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve implementation to check read access to forks and add pagination. Fixes #13648 The following optimizations where made: - Pagination was added. - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project. See merge request !2991
\| * \| \| \| \| \| \| \| \| \| \| \|	Logged in user should be able to read internal forks.	Rubén Dávila	2016-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Improve implementation to check read access to forks and add pagination.	Rubén Dávila	2016-02-26	2	-14/+22
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-migration' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken migration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For !2927 See merge request !3011
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken migration	Dmitriy Zaporozhets	2016-02-29	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>