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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs	Jacob Vosmaer	2016-03-03	10	-29/+79
\|\
\| *	Merge branch 'issue_4095' into 'master'	Dmitriy Zaporozhets	2016-03-03	2	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980
\| \| *	Don't list merge requests from archived projects in Group view.	Rubén Dávila	2016-03-02	1	-1/+1
\| \| \|
\| \| *	Don't list issues from archived projects in Group view.	Rubén Dávila	2016-03-02	1	-1/+1
\| \| \|
\| * \|	Merge branch 'improve-user-tabs' into 'master'	Jacob Schatz	2016-03-03	1	-7/+53
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
\| \| * \	Merge branch 'master' into improve-user-tabs	Alfredo Sumaran	2016-03-01	5	-24/+29
\| \| \|\ \
\| \| * \| \|	Make url and actions to be the same name	Alfredo Sumaran	2016-03-01	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Respond with 'show' view. Tab content will be loaded dinamically	Alfredo Sumaran	2016-03-01	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	Respond to .json requests	Alfredo Sumaran	2016-02-29	1	-3/+24
\| \| \| \| \|
\| \| * \| \|	Add routes and actions for dynamic tab loading	Josh Frye	2016-02-29	1	-7/+32
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'	Rémy Coutable	2016-03-02	1	-1/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tag deletion doesn't use AJAX anymore See merge request !2986
\| \| * \| \| \|	Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajax	Rémy Coutable	2016-03-01	1	-1/+6
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' ↵	Douwe Maan	2016-03-02	1	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Don't show "Welcome to GitLab" when the search didn't return any projects Fixes #13785. /cc @pixdrift ### Before ![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png) ### After ![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png) See merge request !3059
\| \| * \| \| \|	Don't show "Welcome to GitLab" when the search didn't return any projects	Rémy Coutable	2016-03-02	1	-2/+2
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'	Douwe Maan	2016-03-02	1	-0/+2
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix permissions for deprecated CI build status badge This fixes permissions for deprecated status badge, being unavailable even if project is public. Closes #13324 See merge request !3030
\| \| * \| \|	Do not require authentication for CI status badgefix/deprecated-ci-badge-permissions	Grzegorz Bizon	2016-03-01	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes only deprecated CI badge that we keep for backwards compatibility. See !3030#note_4041498.
\| \| * \| \|	Fix deprecated CI build status badge permissions	Grzegorz Bizon	2016-03-01	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'logged-out-search' into 'master'	Robert Speicher	2016-03-01	1	-0/+2
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logged out search Fixes #13676 See merge request !3045
\| \| * \| \|	Enable search for logged-out users	Dmitriy Zaporozhets	2016-03-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'rs-improve-grace-period' into 'master'	Douwe Maan	2016-03-01	1	-5/+7
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \|	Merge branch 'safe-content-type' into 'master'	Douwe Maan	2016-03-01	2	-12/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-12/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs	Jacob Vosmaer	2016-03-01	5	-9/+80
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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	6	-6/+73
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \|	fix/contributions-forked-projects
\| \| * \| \|	include contributions from forked projects on profile calendar	James Lopez	2016-02-22	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'issue_13648' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-6/+16
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-6/+16
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch '11489-branded-appearance-to-ce' into 'master'	Douwe Maan	2016-02-29	2	-2/+60
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927
\| \| * \| \|	Branded login page also in CE11489-branded-appearance-to-ce	Zeger-Jan van de Weg	2016-02-26	2	-2/+60
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
\| * \| \|	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-24	1	-0/+6
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-23	19	-45/+198
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into avatar-cropping	Johann Pardanaud	2016-02-16	20	-115/+118
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/models/user.rb
\| * \| \| \| \|	Fix #7959: Fix avatar stretching by providing a cropping feature	Johann Pardanaud	2016-02-09	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	No need for @compare	Jacob Vosmaer	2016-02-26	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Fixes caught by failing tests	Jacob Vosmaer	2016-02-26	2	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Fix broken merge	Jacob Vosmaer	2016-02-26	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Make more use of DiffHelper	Jacob Vosmaer	2016-02-26	3	-5/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs	Jacob Vosmaer	2016-02-25	37	-163/+363
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'issue_13301_emoji-menu' into 'master'	Robert Speicher	2016-02-24	1	-0/+6
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load award emoji picker with ajax request Fixes #13301. See merge request !2888
\| \| * \| \| \|	Update award_emoji test	Annabel Dunstone	2016-02-23	1	-1/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Create EmojisController	Annabel Dunstone	2016-02-22	2	-4/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Load award emoji picker with ajax request	Annabel Dunstone	2016-02-18	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix-todos' into 'master'	Robert Speicher	2016-02-23	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
\| \| * \| \| \| \|	Does not raise an error when Todo is already marked as done	Douglas Barbosa Alexandre	2016-02-23	1	-1/+1
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Correctly checks if tree view is on screen	Phil Hughes	2016-02-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixes issue with file view rows not clickable on project main viewfiles-view-row-click	Phil Hughes	2016-02-23	1	-3/+3
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed an issue where it would only load the first 25 commit data on project main view Stopped the file view sending 1 too many requests Fixes #3916
\| * \| \| \|	Use before_action instead of before_filter	Douglas Barbosa Alexandre	2016-02-21	1	-1/+1
\| \| \| \| \|