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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add token to runner details output in API	Tomasz Maczukin	2016-02-19	3	-1/+3
\|
*	More fixes in runners doc	Achilleas Pipinellis	2016-02-19	1	-8/+13
\| \| \| \|	[ci skip]
*	Correct PRIVATE-TOKEN to use dash instead of underscore	Achilleas Pipinellis	2016-02-19	1	-8/+8
\|
*	Note that `ci/api/runners.rb` is still used	Achilleas Pipinellis	2016-02-19	1	-2/+3
\| \| \| \|	[ci skip]
*	Add associated project info to runner details output	Tomasz Maczukin	2016-02-19	2	-0/+14
\|
*	Fix runners API spec	Tomasz Maczukin	2016-02-19	1	-11/+11
\|
*	Split `/runners` entrypoint to `/runners` and `/runners/all`	Tomasz Maczukin	2016-02-19	3	-22/+108
\|
*	Add some fixes in runners API documentation	Tomasz Maczukin	2016-02-19	2	-6/+6
\|
*	Add `Example response` above each json output	Achilleas Pipinellis	2016-02-19	1	-7/+21
\| \| \| \|	[ci skip]
*	Add note of deprecation in old Runners CI API	Achilleas Pipinellis	2016-02-19	1	-1/+4
\|
*	Add runners API documentation [ci-skip]	Tomasz Maczukin	2016-02-19	2	-0/+235
\|
*	Fix runners filtering in API	Tomasz Maczukin	2016-02-19	2	-20/+27
\|
*	Add missing methods documentation; fix rubocop reported violation	Tomasz Maczukin	2016-02-19	1	-1/+36
\|
*	Add feature to enable/disable runner in project	Tomasz Maczukin	2016-02-19	2	-0/+128
\|
*	Add basic runners management API	Tomasz Maczukin	2016-02-19	5	-0/+398
\| \| \| \| \| \| \|	- add feature to list runners - add feature to show runners details - add feature to delete runner - add feature to update runner
*	Merge branch 'web_editor' into 'master'	Achilleas Pipinellis	2016-02-19	17	-16/+110
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update web editor documentation Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 Closes #4262 See merge request !2776
\| *	Update web editor documentationweb_editor	Achilleas Pipinellis	2016-02-10	17	-16/+110
\| \| \| \| \| \| \| \| \| \|	Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 [ci skip]
* \|	Merge branch '12791-hide-project-limit-reached-warning' into 'master'	Douwe Maan	2016-02-19	2	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
\| * \|	Project limit is reached warning is hidden when the projects_limit is zero	Zeger-Jan van de Weg	2016-02-19	2	-1/+2
\|/ / \| \| \| \| \| \|	Fixes #12791
* \|	Merge branch 'rs-emoji' into 'master'	Douwe Maan	2016-02-19	13	-3113/+20165
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gemojione for new hotness :sparkles: Before \| After ------ \| ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) \| ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
\| * \|	Update Emoji sprite and its SCSS for new stylesrs-emoji	Robert Speicher	2016-02-17	2	-1269/+1723
\| \| \|
\| * \|	Update fixtures/emojis/aliases.json	Robert Speicher	2016-02-15	2	-3/+153
\| \| \| \| \| \| \| \| \| \| \| \|	Also adds a script to re-generate them from the index.
\| * \|	Update fixtures/emojis/index.json	Robert Speicher	2016-02-15	1	-1823/+18276
\| \| \| \| \| \| \| \| \| \| \| \|	Current as of Gemojione 2.2.1 - https://git.io/vgQx0
\| * \|	Fix specs expecting `emoji/` in image path	Robert Speicher	2016-02-13	2	-3/+3
\| \| \|
\| * \|	Update Emoji asset path	Robert Speicher	2016-02-12	3	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
\| * \|	Update gitlab_emoji to ~> 0.3.0	Robert Speicher	2016-02-12	2	-5/+5
\| \| \|
\| * \|	Remove unused emoji_autocomplete_source helper	Robert Speicher	2016-02-12	1	-6/+0
\| \| \|
* \| \|	Merge branch 'fix/project-forks-page' into 'master'	Douwe Maan	2016-02-19	3	-1/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	workaround for forks with an invalid repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465 The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem... Also fixing Sentry issue: 1180 `undefined method 'already_forked?' for nil:NilClass ` See merge request !2836
\| * \| \|	update based on feedback	James Lopez	2016-02-19	2	-2/+2
\| \| \| \|
\| * \| \|	updated fix based on MR feedback	James Lopez	2016-02-17	5	-11/+4
\| \| \| \|
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-17	51	-261/+743
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/project-forks-page
\| * \| \| \|	workaround for forks with an invalid repo - avoid showing them in the list	James Lopez	2016-02-16	3	-1/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-show-owner-label' into 'master'	Douwe Maan	2016-02-19	2	-9/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow `ProjectTeam#human_max_access` to return "Owner" See merge request !2881
\| * \| \| \| \|	Allow `ProjectTeam#human_max_access` to return "Owner"rs-show-owner-label	Robert Speicher	2016-02-18	2	-9/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-02-19	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	number_with_delimiter() added See merge request !2886
\| * \| \| \| \| \|	number_with_delimiter() added	heiko	2016-02-19	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-02-18	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug found by Charles Sibbald at Sky. Calls with patricio and Jacob confirmed this. [ci skip] See merge request !2877
\| * \| \| \| \| \|	bug found by Charles Sibbald at Sky . Calls with patricio and Jacob ↵	Richard Pidgeon	2016-02-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	confirmed this
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-02-18	1	-21/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No changes to nginx config in this update. Removed unnecessary instructions. [ci skip] See merge request !2879
\| * \| \| \| \| \| \|	No changes to nginx config in this update. Removed unnecessary instructions.	Brandon Patton	2016-02-18	1	-21/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'revert-2782' into 'master'	Douwe Maan	2016-02-18	8	-378/+27
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'saml-decoupling' into 'master'" This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9. Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2782 See merge request !2878
\| * \| \| \| \| \| \|	Revert "Merge branch 'saml-decoupling' into 'master' "	Douwe Maan	2016-02-18	8	-378/+27
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* \| \| \| \| \| \|	Merge branch 'rs-sentry-release-tracking' into 'master'	Douwe Maan	2016-02-18	2	-2/+3
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add release tracking for Sentry See merge request !2863
\| * \| \| \| \| \|	Add release tracking for Sentryrs-sentry-release-tracking	Robert Speicher	2016-02-17	2	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'saml-decoupling' into 'master'	Robert Speicher	2016-02-18	8	-27/+378
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782
\| * \| \| \| \| \| \|	Decouple SAML authentication from the default Omniauth logic	Patricio Cano	2016-02-18	8	-27/+378
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'cache-clear' into 'master'	Robert Speicher	2016-02-18	2	-5/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use SCAN during 'rake cache:clear' This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway. See merge request !2872
\| * \ \ \ \ \ \	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Jacob Vosmaer	2016-02-18	64	-208/+777
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cache-clear
\| * \| \| \| \| \| \|	Use SCAN during 'rake cache:clear'cache-clear	Jacob Vosmaer	2016-02-18	2	-5/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway.
* \| \| \| \| \| \| \|	Merge branch 'autocrlf-lazy' into 'master'	Robert Speicher	2016-02-18	2	-11/+71
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859