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	11	-62/+384
\|\
\| *	Change `js-quick-submit` behavior to expect the class on the form	Robert Speicher	2016-03-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	Now it will work on any field inside that form, and it's easier to scope new behavior, which is what we're adding next!
\| *	Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'	Douwe Maan	2016-03-02	1	-0/+53
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-12/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes only deprecated CI badge that we keep for backwards compatibility. See !3030#note_4041498.
\| \| *	Fix specs for deprecated CI build status badge	Grzegorz Bizon	2016-03-01	1	-1/+2
\| \| \|
\| \| *	Fix deprecated CI build status badge permissions	Grzegorz Bizon	2016-03-01	1	-0/+53
\| \| \|
\| * \|	Merge branch 'issue_13716' into 'master'	Douwe Maan	2016-03-02	1	-4/+31
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check for conflicts before creating new revert branch Fixes #13716 See merge request !2953
\| \| * \|	Add some specs for Repository#revert.issue_13716	Rubén Dávila	2016-03-01	1	-4/+31
\| \| \| \|
\| * \| \|	Merge branch 'rs-filter-array' into 'master'	Douwe Maan	2016-03-02	1	-0/+39
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add FilterArray class to Banzai See merge request !3053
\| \| * \| \|	Add FilterArray class to Banzairs-filter-array	Robert Speicher	2016-03-01	1	-0/+39
\| \| \|/ /
\| * \| \|	Merge branch 'mail-room-config-without-rails' into 'master'	Douwe Maan	2016-03-02	3	-0/+78
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't load all of GitLab in mail_room Fixes #12731 cc @jacobvosmaer See merge request !3005
\| \| * \|	Merge branch 'master' into mail-room-config-without-railsmail-room-config-without-rails	Douwe Maan	2016-02-29	4	-14/+122
\| \| \|\ \
\| \| * \| \|	Don't load all of GitLab in mail_room	Douwe Maan	2016-02-26	3	-0/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #12731
\| * \| \| \|	Merge branch 'fix/commit-status-api-improvement' into 'master'	Douwe Maan	2016-03-01	1	-54/+110
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \|
\| \| * \| \| \|	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	1	-37/+69
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080
\| * \| \| \|	Merge branch 'rs-wiki-toc' into 'master'	Douwe Maan	2016-03-01	1	-0/+52
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2494
\| * \| \| \| \|	Merge branch 'rs-avatar-validation' into 'master'	Douwe Maan	2016-03-01	1	-1/+15
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+15
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13905
\| * \| \| \| \|	Merge branch 'rs-improve-grace-period' into 'master'	Douwe Maan	2016-03-01	2	-0/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \|	Reset `otp_grace_period_started_at` after disabling 2FA	Robert Speicher	2016-02-29	2	-0/+3
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Use DiffCollection#overflow?	Jacob Vosmaer	2016-03-01	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs	Jacob Vosmaer	2016-03-01	18	-22/+262
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch 'fix/contributions-forked-projects' into 'master'	Douwe Maan	2016-03-01	1	-0/+18
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	22	-72/+342
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/contributions-forked-projects
\| \| * \| \| \| \|	include contributions from forked projects on profile calendar	James Lopez	2016-02-22	1	-0/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix/project-wiki-ending' into 'master'	Robert Speicher	2016-02-29	1	-0/+12
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	14	-22/+200
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	fix/project-wiki-ending
\| \| * \| \| \| \|	updated internal.rb and spec based on MR feedback	James Lopez	2016-02-26	1	-2/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fix for projects ending in .wiki	James Lopez	2016-02-24	1	-0/+10
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'rs-data-links' into 'master'	Douwe Maan	2016-02-29	1	-1/+15
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize `data` and `vbscript` links Closes #13625 Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660 See merge request !2905
\| \| * \| \| \| \|	Sanitize `vbscript:` linksrs-data-links	Robert Speicher	2016-02-23	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
\| \| * \| \| \| \|	Sanitize `data:` links	Robert Speicher	2016-02-21	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13625
\| * \| \| \| \| \|	Merge branch '11489-branded-appearance-to-ce' into 'master'	Douwe Maan	2016-02-29	2	-0/+18
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'rs-fix-issue-filter-spec' into 'master'	Robert Speicher	2016-02-27	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue milestone filter spec See merge request !2990
\| \| * \| \| \| \| \|	Fix issue milestone filter specrs-fix-issue-filter-spec	Robert Speicher	2016-02-26	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master'	Robert Speicher	2016-02-26	2	-10/+14
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip leading and trailing spaces in URL validator _Originally opened at !2914 by @evuez._ It makes URLs in webhooks valid even if they contain leading and/or trailing spaces. Spaces are hard to notice in input fields, this helps users by accepting leading and trailing spaces in webhooks URLs. Fixes #13652 See merge request !2939
\| \| * \| \| \| \| \|	Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spaces	evuez	2016-02-26	2	-10/+14
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'repository-caching-refactor' into 'master'	Robert Speicher	2016-02-26	1	-2/+106
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Repository Caching Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515 See merge request !2936
\| \| * \| \| \| \|	Added specs for the various Repository hooksrepository-caching-refactor	Yorick Peterse	2016-02-25	1	-2/+106
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into avatar-croppingavatar-cropping	Alfredo Sumaran	2016-02-26	3	-2/+16
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch 'rs-crowd-form-view-spec' into 'master'	Rémy Coutable	2016-02-26	1	-0/+37
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move "I should see Crowd login form" feature to a view spec We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec. See merge request !2963
\| \| * \ \ \ \ \	Merge branch 'fix-todos' into 'master'	Robert Speicher	2016-02-25	1	-0/+10
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not create a Todo when commenting on commit or project snippet Closes #13733 See merge request !2964
\| \| \| * \| \| \| \| \|	Does not create a todo when commenting on commit or project snippet	Douglas Barbosa Alexandre	2016-02-24	1	-0/+10
\| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'	Dmitriy Zaporozhets	2016-02-25	1	-1/+5
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Add a spec for coverage indicator in project's builds listBaertierchen/gitlab-ce-showTestCoverage	Rémy Coutable	2016-02-22	1	-1/+5
\| \| \| \| \| \| \| \| \|