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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch 'drop-satellites'"	Dmitriy Zaporozhets	2015-08-11	6	-6/+35
\| \| \| \| \| \| \|	This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Revert "Merge branch 'improve-merge-requests' into 'master' "	Dmitriy Zaporozhets	2015-08-11	2	-41/+0
\| \| \| \| \|	This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
*	Merge branch 'merge-notifs' into 'master'	Robert Speicher	2015-08-07	1	-11/+28
\|\ \| \| \| \| \| \|	See merge request !1077
\| *	Merge branch 'master' into merge-notifsmerge-notifs	Douwe Maan	2015-08-06	29	-50/+246
\| \|\
\| * \|	Update notification docs	Douwe Maan	2015-08-06	1	-11/+28
\| \| \|
* \| \|	Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227	Achilleas Pipinellis	2015-08-07	1	-0/+1
\| \| \|
* \| \|	Link merge request doc to READMEimprove-merge-requests	Dmitriy Zaporozhets	2015-08-07	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Create ref for every merge request. Add documentation for fetch merge requests	Dmitriy Zaporozhets	2015-08-07	1	-0/+41
\| \|/ \|/\| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'fix-link-to-guide' into 'master'	Douwe Maan	2015-08-06	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace relative url with full path, remove old reference for indexes See merge request !1091
\| * \|	Replace relative url with full path, remove old reference for indexes	Achilleas Pipinellis	2015-08-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #2176 (gitlab.com)
* \| \|	Update stable branch in installation documentation. Fixes #2191	Achilleas Pipinellis	2015-08-05	1	-2/+2
\| \| \|
* \| \|	Merge branch 'drop-satellites'	Dmitriy Zaporozhets	2015-08-05	6	-35/+6
\|\ \ \
\| * \| \|	Remove satellites from requirements docs and add CHANGELOGdrop-satellites	Dmitriy Zaporozhets	2015-08-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'master' into drop-satellites	Dmitriy Zaporozhets	2015-08-04	33	-127/+450
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Remove satellites mention from architecture doc	Dmitriy Zaporozhets	2015-07-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Remove satellites	Dmitriy Zaporozhets	2015-07-15	5	-32/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-05	2	-0/+2
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'update_release_doc' into 'master'	Dmitriy Zaporozhets	2015-08-05	2	-0/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update release doc See merge request !1097
\| \| * \| \| \| \|	update release doc	Valery Sizov	2015-08-05	2	-0/+2
\| \| \| \|/ / / \| \| \|/\| \| \|
* \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-08-05	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'server-note' into 'master'	Job van der Voort	2015-08-05	1	-2/+2
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added note about changing servers Because of tweet https://twitter.com/elraro21/status/628650106850516992 See merge request !1919
\| \| * \| \| \|	added note about changing servers	karen Carias	2015-08-04	1	-1/+1
\| \| \|/ / /
* \| \| \| \|	Merge branch 'rs-issue-2135' into 'master'	Dmitriy Zaporozhets	2015-08-05	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs for Ruby MRI 2.1 requirement Addresses #2135 See merge request !1089
\| * \| \| \|	Update docs for Ruby MRI 2.1 requirementrs-issue-2135	Robert Speicher	2015-08-04	1	-2/+2
\| \|/ / /
* \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2015-08-04	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated restore docs wrt backup location [ci skip] Made sure to point out that the restore location can be overwritten by an entry in the config. See merge request !1030
\| * \| \|	fixed typo in backup_restore.md	Mike C	2015-07-30	1	-2/+2
\| \| \| \|
\| * \| \|	updated restore docs wrt backup location [ci skip]	mchristof	2015-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made sure to point out that the restore location can be overwritten by an entry in the config.
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-04	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Link to admin raketask	Sytse Sijbrandij	2015-08-03	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-user' into 'master'	Job van der Voort	2015-08-04	7	-0/+29
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added new doc about adding users and members Added new doc in workflow about how to add users and members and I also linked it to "permissions". See merge request !1916
\| * \| \| \|	typo	karen Carias	2015-08-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	text fixed	karen Carias	2015-08-03	2	-8/+8
\| \| \| \| \|
\| * \| \| \|	typo	karen Carias	2015-07-30	2	-9/+9
\| \| \| \| \|
\| * \| \| \|	added new doc about adding users and members	karen Carias	2015-07-30	7	-0/+29
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-03	3	-11/+141
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'master' into api-useremails	Douwe Maan	2015-07-31	2	-11/+9
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch 'typo-corrections' into 'master'	Stan Hu	2015-07-30	1	-4/+4
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor styling fixes - Link to rendered html instead of markdown source. - Removed typos See merge request !1044
\| \| \| * \| \| \|	Minor styling fixes.	Arno Fleming	2015-07-25	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Link to rendered html instead of markdown source. - Removed typos
\| \| * \| \| \| \|	Updated Twitter OmniAuth documentation	Raphaël Doursenaud	2015-07-29	1	-7/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix docs	Douwe Maan	2015-07-30	1	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add ability to manage user email addresses via the API.	Douwe Maan	2015-07-29	1	-0/+132
\| \|/ / / / /
* \| \| \| \| \|	small changes	karen Carias	2015-07-31	8	-9/+9
\| \| \| \| \| \|
* \| \| \| \| \|	added image	karen Carias	2015-07-30	2	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	added new doc about creating MR	karen Carias	2015-07-30	2	-0/+43
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵	Jacob Vosmaer	2015-07-29	8	-36/+45
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \|	backup-archive-permissions
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Valery Sizov	2015-07-29	5	-34/+7
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Add "Manage merge requests" permission to docs	Robert Speicher	2015-07-24	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'auth-icons-labels' into 'master'	Valery Sizov	2015-07-24	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label. ![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png) ![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png) ![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png) ![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png) See merge request !927
\| \| \| * \| \|	Allow custom label to be set for authentication providers.auth-icons-labels	Douwe Maan	2015-07-23	1	-1/+1
\| \| \| \|/ /
\| \| * \| \|	Clarify some things in monthly.md	Sytse Sijbrandij	2015-07-23	1	-5/+5
\| \| \| \| \|