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

	Commit message (Collapse)	Author	Age	Files	Lines
*	log documentation	Valery Sizov	2015-02-13	2	-0/+101
\|
*	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-02-12	187	-3563/+3816
\|\
\| *	Merge pull request #8785 from jvanbaarsen/rspec-upgrade	Dmitriy Zaporozhets	2015-02-12	187	-3563/+3816
\| \|\ \| \| \| \| \| \|	Rspec upgrade
\| \| *	Fixed deprecation in spinach stubs	Jeroen van Baarsen	2015-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| \| *	Even more hound fixes	Jeroen van Baarsen	2015-02-12	16	-191/+266
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| \| *	Fixed tests for spinach	Jeroen van Baarsen	2015-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| \| *	Fixed hound warnings	Jeroen van Baarsen	2015-02-12	6	-15/+31
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| \| *	Updated rspec to rspec 3.x syntax	Jeroen van Baarsen	2015-02-12	183	-3453/+3610
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| \| *	Started on the rspec upgrade	Jeroen van Baarsen	2015-02-12	4	-16/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \|	Merge branch 'clean-oauth-username' into 'master'	Dmitriy Zaporozhets	2015-02-13	5	-6/+33
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean username acquired from OAuth/LDAP. Fixes #1967. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813 See merge request !1500
\| * \|	Clean username acquired from OAuth/LDAP.	Douwe Maan	2015-02-12	5	-6/+33
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1967.
* \| \|	Merge pull request #8779 from ↵	Dmitriy Zaporozhets	2015-02-12	1	-2/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	KelvinMutuma/show-assignees-in-merge-requests-index Show assignees in the merge-requests index
\| * \| \|	Show Work In progress if a merge request is not assigned	Kelvin Mutuma	2015-02-12	1	-0/+2
\| \| \| \|
\| * \| \|	Show assignees in the merge-requests index	Kelvin Mutuma	2015-02-12	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-02-12	2	-4/+17
\|\ \ \ \
\| * \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Sytse Sijbrandij	2015-02-12	2	-4/+17
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'master' into 'master'	Dmitriy Zaporozhets	2015-02-12	2	-4/+17
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds new label color suggestions This adds a bunch of label color suggestions ![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png) ![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png) See merge request !289
\| \| \| * \| \| \|	Change label color text field type to "color"	Benjamin Kammerl	2015-02-11	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Reorders label colors for better "rainbow"	phortx	2015-01-13	1	-8/+8
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add more label color suggestions	phortx	2015-01-13	1	-1/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-02-12	34	-74/+65
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| / \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #8445 from jvanbaarsen/project-spec-speed-up	Jeroen van Baarsen	2015-02-12	2	-73/+32
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests/api/project_spec.rb speed up
\| \| * \| \| \| \|	Improved speed of the project_spec.rb	Jeroen van Baarsen	2015-02-03	2	-73/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| * \| \| \| \| \|	Merge pull request #8739 from jvanbaarsen/pr/7818	Jeroen van Baarsen	2015-02-12	32	-1/+33
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	note about latest details being on master branch
\| \| * \| \| \| \| \|	note about latest details being on master branch	Ben Bodenmiller	2015-02-05	32	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'gitattributes-merge-union' into 'master'	Sytse Sijbrandij	2015-02-12	3	-35/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitattribute merge=union to reduce CHANGELOG merge conflicts. See gitlab/organization#137. Tested and found working! @sytse How would you like to address this in [the article](https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/)? Simply replace "Thanks ayufan, we'll try this instead." by "Thanks ayufan, we've implemented this instead."? See merge request !1505
\| * \| \| \| \| \| \| \|	Use gitattribute merge=union to reduce CHANGELOG merge conflicts.	Douwe Maan	2015-02-12	3	-35/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issues_tracker_template' into 'master'	Dmitriy Zaporozhets	2015-02-12	35	-56/+280
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues trackers template If admin defines service template, service in project will be prefilled with the template data. See merge request !1503
\| * \| \| \| \| \| \| \|	Use the service_name.	Marin Jankovski	2015-02-12	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add a test for service template.	Marin Jankovski	2015-02-12	1	-0/+25
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	All services can have templates.	Marin Jankovski	2015-02-12	4	-14/+26
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove unecessary icon.	Marin Jankovski	2015-02-11	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Annotate services. Add a link to service template.	Marin Jankovski	2015-02-11	23	-51/+55
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add admin services templates.	Marin Jankovski	2015-02-11	9	-15/+162
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove not null constraint on project_id in services.	Marin Jankovski	2015-02-11	3	-4/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add template boolean to services.	Marin Jankovski	2015-02-11	3	-2/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add ExternalIssue base model to make issue referencing more robust for ↵	Marin Jankovski	2015-02-11	3	-4/+30
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	external issue trackers.
* \| \| \| \| \| \| \|	Merge branch 'api-edit-groups' into 'master'	Dmitriy Zaporozhets	2015-02-12	8	-32/+133
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit group members via API Fixes #1840. Implement a new API endpoint to update the access level of an existing group member. Includes new tests and updated API docs. cc @sytse @douwe See merge request !1504
\| * \| \| \| \| \| \| \|	Edit group members via API	Vinnie Okada	2015-02-11	6	-11/+109
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an API endpoint to update the access level of an existing group member.
\| * \| \| \| \| \| \|	Merge pull request #8750 from wtw/master	Sytse Sijbrandij	2015-02-11	1	-19/+22
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revise main README for cleanup and some minor clarifications
\| \| * \| \| \| \| \| \|	Revise main README for cleanup and some minor clarifications	Wolfram Twelker	2015-02-08	1	-19/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix typos, add links, add minor text changes * Rephrase three section for clarity [ci skip]
\| * \| \| \| \| \| \| \|	Merge pull request #8778 from al3x-edge/fix-emoji-link	Sytse Sijbrandij	2015-02-11	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|	Update Emoji Cheat Sheet Link
\| \| * \| \| \| \| \| \|	Change emoji cheat sheet link to Amazon S3	Alexander Ambrose	2015-02-11	1	-2/+2
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The emoji cheat sheet link was changed. Commit changes the url to the updated link and fixes issue #8554.
* \| \| \| \| \| \| \|	Merge branch 'ssh-link' into 'master'	Dmitriy Zaporozhets	2015-02-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to SSH help page. Closes #1981. See merge request !1502
\| * \| \| \| \| \| \|	Fix link to SSH help page.	Douwe Maan	2015-02-11	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1981.
* \| \| \| \| \| \|	Merge branch 'issue_1064-fix_broken_doc_links' into 'master'	Sytse Sijbrandij	2015-02-11	1	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Issue 1064 Fixes broken doc links within the installation section, as described in: https://gitlab.com/gitlab-org/gitlab-ce/issues/1064 See merge request !334
\| * \| \| \| \| \| \|	Fix two broken links in the installation section.	Ewan Edwards	2015-02-11	1	-2/+4
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'mobile-maximum-scale-1' into 'master'	Dmitriy Zaporozhets	2015-02-11	4	-1/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow page to be scaled on mobile and add horizontal scrolling to code blocks Closes #1974. Previously, scaling (both automatically and manually) was enabled on mobile, which caused the top and sidebar to move over content. Scaling is now disabled. Also previously, code in issues or comments too wide to fit inside the width of the window would "flow out" on the right, causing the whole page to become very wide and causing scrolling to scroll the entire page instead of just the code. Code blocks now scroll themselves. See merge request !1501
\| * \| \| \| \| \| \|	Add horizontal scrolling to code blocks.	Douwe Maan	2015-02-11	2	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't allow page to be scaled on mobile.	Douwe Maan	2015-02-09	2	-1/+2
\| \| \| \| \| \| \| \|