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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed heading weightaudit-log-ui	Phil Hughes	2016-03-02	2	-1/+2
\|
*	audit log UI update	Phil Hughes	2016-03-02	4	-21/+32
\| \| \| \|	Closes #13862
*	Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'	Douwe Maan	2016-03-02	3	-0/+56
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-13/+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
\| \|
\| *	Add Changelog entry for CI badge fix	Grzegorz Bizon	2016-03-01	1	-0/+1
\| \|
\| *	Fix deprecated CI build status badge permissions	Grzegorz Bizon	2016-03-01	2	-0/+56
\| \|
* \|	Merge branch 'issue_13623' into 'master'	Douwe Maan	2016-03-02	4	-14/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show days remaining instead of elapsed time for Milestone. Closes #13623 See merge request !2978
\| * \|	Little refactor for milestone_remaining_days helper from last code review.issue_13623	Rubén Dávila	2016-03-01	2	-6/+4
\| \| \|
\| * \|	Show days remaining instead of elapsed time for Milestone.	Rubén Dávila	2016-03-01	4	-14/+17
\| \| \|
* \| \|	Merge branch 'issue_13716' into 'master'	Douwe Maan	2016-03-02	3	-27/+62
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-5/+32
\| \| \| \|
\| * \| \|	Check for conflicts before creating target branch.	Rubén Dávila	2016-03-01	2	-23/+31
\| \|/ /
* \| \|	Merge branch 'rs-filter-array' into 'master'	Douwe Maan	2016-03-02	11	-13/+76
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add FilterArray class to Banzai See merge request !3053
\| * \| \|	Add FilterArray class to Banzairs-filter-array	Robert Speicher	2016-03-01	11	-13/+76
\| \|/ /
* \| \|	Merge branch 'mail-room-config-without-rails' into 'master'	Douwe Maan	2016-03-02	7	-45/+135
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	14	-41/+181
\| \|\ \ \
\| * \| \| \|	Fix `gitlab:incoming_email:check` task.	Douwe Maan	2016-02-29	1	-4/+6
\| \| \| \| \|
\| * \| \| \|	Don't load all of GitLab in mail_room	Douwe Maan	2016-02-26	6	-41/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #12731
* \| \| \| \|	Merge branch 'fix/wrong-anchor-in-process' into 'master'	Achilleas Pipinellis	2016-03-02	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong anchor in PROCESS.md See merge request !3060
\| * \| \| \| \|	Fix wrong anchor in PROCESS.md	Rémy Coutable	2016-03-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'	Rémy Coutable	2016-03-02	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import from gitlab.com fails _Originally opened at !2896 by @kazsw._ - - - Fixes #12652 CGI.escape encodes '/' by default. Second argument can be removed. See merge request !2988
\| * \| \| \| \|	Fix import from gitlab.com	Kazuki Sawada	2016-03-02	2	-1/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #12652
* \| \| \| \|	Merge branch 'shortcuts-help' into 'master'	Rémy Coutable	2016-03-02	2	-1/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix help keyboard shortcut for relative URL setups Fixes gitlab-org/gitlab-ce#12751 See merge request !3016
\| * \| \| \| \|	Fix help keyboard shortcut for relative URL setups	Artem Sidorenko	2016-03-01	2	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-update-sprockets' into 'master'	Dmitriy Zaporozhets	2016-03-02	2	-11/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump sprockets to `~> 3.3.5` Closes #6069 See merge request !3055
\| * \| \| \| \| \|	Bump sprockets to `~> 3.3.5`rs-update-sprockets	Robert Speicher	2016-03-01	2	-11/+7
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #6069
* \| \| \| \| \|	Merge branch 'notes_guidelines' into 'master'	Achilleas Pipinellis	2016-03-02	1	-3/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change doc styleguide to use blockquotes for notes See merge request !3009
\| * \| \| \| \| \|	Change doc styleguide to use quotes for notesnotes_guidelines	Achilleas Pipinellis	2016-02-29	1	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'saml-doc-update' into 'master'	Achilleas Pipinellis	2016-03-02	2	-49/+138
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated SAML and Omniauth docs Updated SAML and Omniauth docs with information on the new behavior recently introduced in !2882 /cc @ernstvn @DouweM See merge request !2950
\| * \| \| \| \| \|	Style updates.saml-doc-update	Patricio Cano	2016-03-01	2	-20/+30
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated SAML and Omniauth docs with information on the new behavior recently ↵	Patricio Cano	2016-02-23	2	-47/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	introduced in !2882
* \| \| \| \| \| \|	Merge branch 'logged-out-search' into 'master'	Robert Speicher	2016-03-01	11	-43/+72
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logged out search Fixes #13676 See merge request !3045
\| * \| \| \| \| \|	Refactor UI header for logged out users	Dmitriy Zaporozhets	2016-03-01	3	-47/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	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 'document-design-to-development-process' into 'master'	Achilleas Pipinellis	2016-03-01	2	-50/+118
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.md Closes gitlab-com/www-gitlab-com#544 See merge request !2983
\| * \| \| \| \| \| \|	Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.md	Rémy Coutable	2016-03-01	2	-50/+118
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, link to this new paragraph in PROCESS.md and improved a bit this document. [ci skip]
* \| \| \| \| \| \|	Merge branch 'add_customer_label' into 'master'	Douwe Maan	2016-03-01	1	-11/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add customer label explanation and change label references to markdown Add customer label plus change valid labels to markdown format so they render. The unchanged labels do not have actual/valid labels behind them. We should consider removing them since they're obviously not used. cc/ @sytses @dzaporozhets @DouweM What do you think about removing the unused labels? Label names are now rendered ![Screen_Shot_2016-02-25_at_10.59.03_AM](/uploads/4869416c120422b605df8982a46f6d61/Screen_Shot_2016-02-25_at_10.59.03_AM.png) See merge request !2972
\| * \| \| \| \| \| \|	Add customer label explanation and change label references to markdown [ci skip]	Drew Blessing	2016-03-01	1	-11/+8
\| \|/ / / / / /
* \| \| \| \| \| \|	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