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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added username to issue & merge request headerusername-issue-header	Phil Hughes	2016-03-01	2	-0/+2
\| \| \| \|	Closes #13771
*	Merge branch 'fix/commit-status-api-improvement' into 'master'	Douwe Maan	2016-03-01	3	-58/+117
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return empty array when commit has no statuses in API This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080 See merge request !3010
\| *	Improve commit status API specsfix/commit-status-api-improvement	Grzegorz Bizon	2016-03-01	1	-30/+19
\| \|
\| *	Check if commit exists first in commit status API	Grzegorz Bizon	2016-03-01	1	-1/+1
\| \|
\| *	Add Changelog entry for commit status API changes	Grzegorz Bizon	2016-02-29	1	-0/+1
\| \|
\| *	Improve commit status API specs (refactoring)	Grzegorz Bizon	2016-02-29	1	-41/+76
\| \|
\| *	Return empty array when commit has no statuses in API	Grzegorz Bizon	2016-02-29	2	-41/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080
* \|	Merge branch 'rel-url-fix' into 'master'	Douwe Maan	2016-03-01	6	-13/+30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix relative URL See https://github.com/gitlabhq/gitlabhq/issues/10053 1. Same configuration way for relative URL like with Omnibus 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile` First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration - [x] tests on the source based installation - [x] tests on the centos&ubuntu omnibus packages Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053 See merge request !2979
\| * \|	Include relative url configuration in rake tasks	Artem Sidorenko	2016-02-29	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initializers are not loaded during the rake task assets:precompile, so assets generation runs without relative url configuration in Rails and produces broken assets.
\| * \|	Use dedicated relative_url.rb initializer	Artem Sidorenko	2016-02-29	4	-13/+26
\| \| \| \| \| \| \| \| \| \| \| \|	in order to have it the same way like in omnibus
* \| \|	Merge branch 'login-flash' into 'master'	Dmitriy Zaporozhets	2016-03-01	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bottom margin for flash container on login page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler Fixes #13935 See merge request !3040
\| * \| \|	Add bottom margin for flash container on login page	Dmitriy Zaporozhets	2016-03-01	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'sidebar-overlap-fix' into 'master'	Dmitriy Zaporozhets	2016-03-01	3	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue with overlap of sidebar links. Thanks @iamphill for the help with this one. ![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png) cc @iamphill @alfredo1 @dzaporozhets @rymai See merge request !3043
\| * \| \| \|	Fix issue with overlap of sidebar links.	Jacob Schatz	2016-03-01	3	-3/+3
\| \|/ / /
* \| \| \|	Merge branch 'rs-wiki-toc' into 'master'	Douwe Maan	2016-03-01	3	-8/+85
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter Closes #2494 See merge request !2952
\| * \| \| \|	Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-toc	Robert Speicher	2016-02-23	3	-8/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2494
* \| \| \| \|	Merge branch 'rs-avatar-validation' into 'master'	Douwe Maan	2016-03-01	2	-2/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only validate avatar cropping values when avatar is present AND changed Closes #13905 See merge request !3018
\| * \| \| \| \|	Only validate avatar cropping values when avatar is present AND changedrs-avatar-validation	Robert Speicher	2016-02-29	2	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13905
* \| \| \| \| \|	Merge branch 'rs-fix-user-namespace_uniq' into 'master'	Douwe Maan	2016-03-01	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly check for a pre-existing error in `User#namespace_uniq` Rails adds an empty error to the Errors object even if you just call `#[]` on it: ``` [1] pry(main)> u = User.last [2] pry(main)> u.errors.keys => [] [3] pry(main)> u.errors[:username].present? => false [4] pry(main)> u.errors.keys => [:username] ``` See merge request !3017
\| * \| \| \| \|	Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniq	Robert Speicher	2016-02-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails adds an empty error to the Errors object even if you just call `#[]` on it: ``` [1] pry(main)> u = User.last [2] pry(main)> u.errors.keys => [] [3] pry(main)> u.errors[:username].present? => false [4] pry(main)> u.errors.keys => [:username] ```
* \| \| \| \| \|	Merge branch 'rs-improve-grace-period' into 'master'	Douwe Maan	2016-03-01	4	-10/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show any "2FA required" message if it's not actually required Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled. See merge request !3014
\| * \| \| \| \| \|	Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-period	Robert Speicher	2016-02-29	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled.
\| * \| \| \| \| \|	Reset `otp_grace_period_started_at` after disabling 2FA	Robert Speicher	2016-02-29	3	-5/+9
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, if the user enabled 2FA, then disabled it and came back some time after the grace period expired, they would be forced to enable 2FA immediately.
* \| \| \| \| \|	Merge branch 'fix-failing-tests' into 'master'	Kamil Trzciński	2016-03-01	1	-0/+6
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Precompile assets before all spinach tests Try to fix failing tests. cc @jschatz1 See merge request !3041
\| * \| \| \| \|	Precompile assets before all spinach tests	Kamil Trzcinski	2016-03-01	1	-0/+6
\|/ / / / /
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|