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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add zip/unzip as dependencies for Pages source installationsdocs/pages-unzip-dep	Achilleas Pipinellis	2017-03-09	1	-8/+12
\| \| \| \|	[ci skip]
*	Merge branch 'patch-13' into 'master'	Rémy Coutable	2017-03-08	1	-1/+3
\|\ \| \| \| \| \| \| \| \|	specify where to finish database HA setup See merge request !9731
\| *	specify where to finish database HA setup	Ben Bodenmiller	2017-03-06	1	-1/+3
\| \|
* \|	Merge branch 'patch-15' into 'master'	Rémy Coutable	2017-03-08	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo with project service documentation link See merge request !9708
\| * \|	Fixed typo with project service documentation link	Miguel	2017-03-05	1	-1/+1
\| \| \|
* \| \|	Merge branch 'patch-14' into 'master'	Rémy Coutable	2017-03-08	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spell out what VIP is See merge request !9733
\| * \| \|	spell out what VIP is	Ben Bodenmiller	2017-03-06	1	-3/+3
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'patch-15' into 'master'	Rémy Coutable	2017-03-08	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update container_registry.md: fix private-docker link See merge request !9686
\| * \| \|	Update container_registry.md: fix private-docker link	NeroBurner	2017-03-03	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'update_crowd_docs' into 'master'	Achilleas Pipinellis	2017-03-08	4	-64/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move and update Crowd authentication documentation See merge request !9775
\| * \| \| \|	Move and update Crowd authentication documentation	Drew Blessing	2017-03-07	4	-64/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current docs did not include information on configuring the app in Crowd. Also, moved the doc to the new administration/auth directory.
* \| \| \| \|	Merge branch 'patch-15' into 'master'	Achilleas Pipinellis	2017-03-08	1	-0/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configuration instructions for Container Registry Notifications. See merge request !9500
\| * \| \| \| \|	Add configuration instructions for Container Registry Notifications.[ci skip]	Alexandre Gomes	2017-03-07	1	-0/+58
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_16834'	Douwe Maan	2017-03-07	3	-19/+38
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/v3_to_v4.md
\| * \| \| \| \| \|	Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834	Felipe Artur	2017-03-07	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v3 and several improvements
\| * \| \| \| \| \|	Update API endpoints for raw files	Felipe Artur	2017-03-07	3	-17/+36
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '1381-present-commits-pagination-headers-correctly' into 'master'	Douwe Maan	2017-03-08	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GET "projects/:id/repository/commits" endpoint improvements Closes #1381 and #20207 See merge request !9679
\| * \| \| \| \| \|	Returns correct header data for commits endpoint	Oswaldo Ferreira	2017-03-07	1	-0/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'tc-api-v4-doc-changes' into 'master'	Douwe Maan	2017-03-08	2	-4/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API v4 doc changes See merge request !9723
\| * \| \| \| \| \|	API V4 is no longer in Beta	Toon Claes	2017-03-07	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And V4 is the preferred version to be used, because V3 will be removed in 9.4 (or later).
\| * \| \| \| \| \|	Update description about GET /projects endpoint	Toon Claes	2017-03-07	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It returns all projects visible for the authenticated user, not just the project they are member of.
* \| \| \| \| \|	Make it possible to query scope as scope[]=	Toon Claes	2017-03-07	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since issues also accepts the query parameter iids[]=, also make it possible query scope like that.
* \| \| \| \| \|	Add GET /projects/:id/pipelines/:pipeline_id/jobs endpoint	Toon Claes	2017-03-07	1	-1/+117
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add endpoint to get the jobs scoped to a pipeline.
* \| \| \| \|	Merge branch 'zj-variables-build-job' into 'master'	Kamil Trzciński	2017-03-07	1	-22/+56
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BUILD to JOB in CI Variables Closes #29053 See merge request !9756
\| * \| \| \| \|	Rename REF to SHA	Z.J. van de Weg	2017-03-07	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Rename BUILD to JOB in CI Variableszj-variables-build-job	Z.J. van de Weg	2017-03-07	1	-22/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given GitLab moves away from using the term build, everywhere, also the CI variables are being renamed. For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same values. However, in about 3 months, support will be dropped.
* \| \| \| \| \|	Merge branch '28447-hybrid-repository-storages' into 'master'	Sean McGivern	2017-03-07	2	-7/+73
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update storage settings to allow extra values per shard See merge request !9597
\| * \| \| \| \| \|	Update storage settings to allow extra values per shard28447-hybrid-repository-storages	Alejandro Rodríguez	2017-03-03	2	-7/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility
* \| \| \| \| \| \|	Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master'	James Lopez	2017-03-07	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change project count limit from 10 to 100000 See merge request !9767
\| * \| \| \| \| \| \|	Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limit	Regis Freyd	2017-03-07	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/deprecate-ci-config-types' into 'master'	Kamil Trzciński	2017-03-07	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate usage of `types` CI/CD configuration entry See merge request !9766
\| * \| \| \| \| \| \| \|	Deprecate usage of `types` CI/CD configuration entry	Grzegorz Bizon	2017-03-07	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'siemens/gitlab-ce-feature/openid-connect'	Sean McGivern	2017-03-07	2	-0/+48
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Implement OpenID Connect identity provider	Markus Koller	2017-03-07	2	-0/+48
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch ↵	Douwe Maan	2017-03-07	2	-0/+104
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'origin/personal_access_token_api_and_impersonation_token'
\| * \| \| \| \| \| \| \|	apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_token	Tiago Botelho	2017-03-06	3	-94/+44
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	refactors finder and correlated code	Tiago Botelho	2017-03-01	2	-45/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	applies relevant changes to the code and code structure	Tiago Botelho	2017-02-28	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	refactors documentation and personal access tokens form to not allow admins ↵	Tiago Botelho	2017-02-28	3	-7/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to generate non impersionation tokens
\| * \| \| \| \| \| \| \|	add documentation and changelog entry for user personal access tokens api	Simon Vocella	2017-02-28	3	-0/+148
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28251-mr-and-issue-iids-for-api-v4' into 'master'	Douwe Maan	2017-03-07	4	-225/+226
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API routes referencing a specific issue should use the issue `iid` Closes #28251 See merge request !9530
\| * \| \| \| \| \| \| \|	Implement review comments from @dbalexandre28251-mr-and-issue-iids-for-api-v4	Timothy Andrew	2017-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Typo in docs - Newline between test/expectation in `api/issues_spec` - Use `find_by` instead of `reference_by` in the structure defining awardables
\| * \| \| \| \| \| \| \|	Add documentation for !9530.	Timothy Andrew	2017-03-07	4	-226/+227
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'set-default-cache-key-for-jobs' into 'master'	Kamil Trzciński	2017-03-07	1	-4/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set default cache key to 'default' for jobs Closes #22419 See merge request !9666
\| * \| \| \| \| \| \| \|	Make cache:key bold, feedback:	Lin Jen-Shin	2017-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24877665
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-03-07	35	-456/+479
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	set-default-cache-key-for-jobs * upstream/master: (289 commits) re-add Assign to Me link on new MR/Issue forms thinner bottom header border make header match old 16px padding of body contents Update font-awesome-rails to 4.7.0.1 Relax font-awesome-rails dependency to ~> 4.7 Restore keyboard shortcuts for "Activity" and "Charts" fix border radius bottom for header match padding for mr-widget sections Update changelog Fix project-last-commit alignment Docs: update GL Pages IP on GL.com Fix up @DouweM review Remove readme-only project view preference Add `uploads` to known models for Import/Export spec Add `has_many` associations for models that can have Upload records Handle relative and absolute Upload paths in the Uploaders Change the default CarrierWave root path for tests Fix Projects::UploadService spec Add a Project::UploadsController spec to ensure an Upload is created Add `RecordsUploads` module to record Upload records via callbacks ...
\| * \| \| \| \| \| \| \|	Update for document feedback:set-default-cache-key-for-jobs	Lin Jen-Shin	2017-03-06	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24829863 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24829880 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24830028
\| * \| \| \| \| \| \| \|	Update cache:key document	Lin Jen-Shin	2017-03-03	1	-4/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Bring back api/builds.md and direct to api/jobs.md	Achilleas Pipinellis	2017-03-07	3	-2/+3
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch '28598-narrow-environment-payload-by-using-basic-project' into ↵	Rémy Coutable	2017-03-07	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Simplify project payload exposed on Environment endpoints in V4 Closes #28598 See merge request !9675