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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Re-use previous lineimprove-user-tabs	Alfredo Sumaran	2016-03-02	1	-5/+4
\|
*	Remove unnecesary assignment	Alfredo Sumaran	2016-03-02	1	-1/+0
\|
*	Set actions dinamically and offer defaultAction as a optional parameter	Alfredo Sumaran	2016-03-02	1	-11/+11
\|
*	Provide defaults and make sure we everything is container into a parent element	Alfredo Sumaran	2016-03-02	3	-108/+118
\|
*	Turn off existing event listeners	Alfredo Sumaran	2016-03-02	1	-0/+4
\|
*	Remove trailing slashes	Alfredo Sumaran	2016-03-02	1	-1/+3
\|
*	Group similar conditionals	Alfredo Sumaran	2016-03-02	1	-7/+1
\|
*	Message for when no groups found	Alfredo Sumaran	2016-03-01	1	-0/+2
\|
*	Add required classname for spec	Alfredo Sumaran	2016-03-01	1	-1/+1
\|
*	Merge branch 'master' into improve-user-tabs	Alfredo Sumaran	2016-03-01	29	-100/+122
\|\
\| *	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-avatar-validation' into 'master'	Douwe Maan	2016-03-01	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-10/+13
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| * \|	Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38	Dmitriy Zaporozhets	2016-02-29	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !2992
\| \| * \|	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 'mr-prefix-activity-view' into 'master'	Jacob Schatz	2016-03-01	5	-6/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-11/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Changed # to ! on merge requests on activity view	Phil Hughes	2016-03-01	4	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9082
\| * \| \| \| \|	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 '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	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	113	-624/+1038
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/contributions-forked-projects
\| \| * \| \| \| \| \|	include contributions from forked projects on profile calendar	James Lopez	2016-02-22	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into issue_13212issue_13212	Alfredo Sumaran	2016-02-29	22	-76/+244
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	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 'removed-ngprogress' into 'master'	Jacob Schatz	2016-02-29	6	-10/+8
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed NGProgress In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820 ![loading](/uploads/8b6ed8982e86e4b94803b56b8cd97737/loading.gif) See merge request !3004
\| \| \| * \| \| \| \|	Removed NGProgressremoved-ngprogress	Phil Hughes	2016-02-29	6	-10/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820
\| \| * \| \| \| \| \|	Merge branch 'too-many-changes-btns' into 'master'	Jacob Schatz	2016-02-29	1	-6/+5
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed too many changes buttons to white Closes #13751 ![Screen_Shot_2016-02-29_at_09.18.41](/uploads/30f5d11d1a4e1785561597feeeb40f09/Screen_Shot_2016-02-29_at_09.18.41.png) See merge request !3002
\| \| \| * \| \| \| \|	Changed too many changes buttons to whitetoo-many-changes-btns	Phil Hughes	2016-02-29	1	-6/+5
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13751
\| \| * \| \| \| \|	Merge branch 'improve-todos-css' into 'master'	Dmitriy Zaporozhets	2016-02-29	2	-35/+6
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small css cleanup for todos feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Cleanup for !2817 Fixes #13816 cc @jschatz1 @skyruler @dbalexandre See merge request !2996
\| \| \| * \| \| \| \|	Small css cleanup for todos featureimprove-todos-css	Dmitriy Zaporozhets	2016-02-27	2	-35/+6
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \|