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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields	Robert Schilling	2017-02-22	10	-21/+83
\|\ \| \| \| \| \| \|	# Conflicts: # doc/api/v3_to_v4.md
\| *	Merge branch '28458-present-gitlab-version-for-v4-changes-on-docs' into ↵	Sean McGivern	2017-02-22	1	-21/+24
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Present GitLab version for each V3 to V4 API change on v3_to_v4.md Closes #28458 See merge request !9425
\| \| *	Add Merge Request link to the v3 to v4 documentation28458-present-gitlab-version-for-v4-changes-on-docs	Toon Claes	2017-02-22	1	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Similar to changelog, mention the Merge Request id & link for each change.
\| \| *	Present GitLab version for each V3 to V4 API change on v3_to_v4.md	Oswaldo Ferreira	2017-02-22	1	-1/+4
\| \| \|
\| * \|	Merge branch 'feature/brand-logo-in-emails' into 'master'	Sean McGivern	2017-02-22	5	-0/+16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Custom brand header logo in emails Closes #24969 and #25570 See merge request !9049
\| \| * \|	add documentation for custom brand logo in email	Alexis Reigel	2017-02-22	5	-0/+16
\| \| \| \|
\| * \| \|	Merge branch '27032-add-a-house-keeping-api-call' into 'master'	Rémy Coutable	2017-02-22	1	-0/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add housekeeping endpoint for Projects API Closes #27032 See merge request !9421
\| \| * \| \|	Add housekeeping endpoint for Projects API	Mark Fletcher	2017-02-22	1	-0/+14
\| \| \| \| \|
\| * \| \| \|	Merge branch '28524-gitlab-ci-yml-coverage-key-is-unknown' into 'master'	Rémy Coutable	2017-02-22	1	-0/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document when current coverage configuration option was introduced Closes #28524 See merge request !9443
\| \| * \| \| \|	Document when current coverage configuration option was introduced	Mark Fletcher	2017-02-22	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Introduced in v8.17 [skip ci]
\| * \| \| \| \|	Merge branch 'patch-9' into 'master'	Rémy Coutable	2017-02-22	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update two_factor_authentication.md by correcting FreeOTP link. See merge request !9368
\| \| * \| \| \|	Update two_factor_authentication.md by correcting FreeOTP link.	Rudi Kramer	2017-02-20	1	-1/+1
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'dev-docs-ci_docker_build-example_variable_use' into 'master'	Rémy Coutable	2017-02-22	1	-0/+24
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs(ci/docker_build): Add example of variable use See merge request !9159
\| \| * \| \| \|	docs(ci/docker_build): Add example of variable use	Dmitriy Volkov	2017-02-21	1	-0/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Remove deprecated `upvotes` and `downvotes` from the notes API	Robert Schilling	2017-02-22	4	-20/+4
\|/ / / / /
* \| \| \| \|	Merge branch '22132-rename-branch-name-params-to-branch' into 'master'	Rémy Coutable	2017-02-22	4	-16/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize branch name params as `branch` on V4 API Closes #22132 See merge request !8936
\| * \| \| \| \|	Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branch	Oswaldo Ferreira	2017-02-21	4	-16/+22
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'api-subscription-restful' into 'master'	Sean McGivern	2017-02-22	4	-13/+14
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Make subscription API more RESTfuL Closes #28327 See merge request !9325
\| * \| \| \| \|	Update documentationapi-subscription-restful	Robert Schilling	2017-02-22	4	-14/+14
\| \| \| \| \| \|
\| * \| \| \| \|	API: Make subscription API more RESTfuL	Robert Schilling	2017-02-21	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '26881-backup-fails-if-data-changes' into 'master'	Douwe Maan	2017-02-21	1	-0/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728
\| * \| \| \| \| \|	# This is a combination of 2 commits.	Drew Blessing	2017-02-21	1	-0/+22
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# This is the 1st commit message: Add `copy` backup strategy to combat file changed errors The backup Rake task used to stream data directly from the live data directory into the backup. Under many circumstances this worked OK. However, really active instances would experience a 'file changed as we read it' error - especially with data like the registry. This now copies the data first, then compresses it. It will take a bit more disk space while the backup is in progress, but it's a necessary thing. # The commit message #2 will be skipped: # Add env var
* \| \| \| \| \|	Merge branch '26703-todos-count' into 'master'	Clement Ho	2017-02-21	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#26703 change todos counter position & format ( for large counts ) Closes #26703 See merge request !9171
\| * \| \| \| \|	change todos counter position & format ( for large counts )	mhasbini	2017-02-21	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master'	Filipa Lacerda	2017-02-21	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename retry failed button on pipeline page to just retry See merge request !9369
\| * \| \| \| \|	fixed specs + docs	dimitrieh	2017-02-20	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'api-todos-restful' into 'master'	Sean McGivern	2017-02-21	2	-11/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use POST methods to mark Todos as done Closes #28467 See merge request !9410
\| * \| \| \| \|	API: Use POST requests to mark todos as done	Robert Schilling	2017-02-21	2	-11/+6
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Update using_docker_images.md	Adam Boseley	2017-02-21	1	-6/+9
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'add-approving-license-process' into 'master'	Clement Ho	2017-02-21	1	-0/+7
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add process for requesting approval for licenses Closes gitlab-com/organization#22 See merge request !9242
\| * \| \|	Add process for requesting approval for licensesadd-approving-license-process	Clement Ho	2017-02-17	1	-0/+7
\| \| \| \|
* \| \| \|	Merge branch 'ux-guide-add-personas' into 'master'	Régis Freyd (GitLab)	2017-02-20	4	-11/+159
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UX Guide: Add personas See merge request !9390
\| * \| \| \|	[ci skip] UX Guide: Add personas	Allison Whilden	2017-02-20	4	-11/+159
\| \| \| \| \|
* \| \| \| \|	Merge branch '26315-unify-labels-filter-behavior' into 'master'	Rémy Coutable	2017-02-20	2	-2/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify issues search behavior by always filtering when ALL labels matches Closes #26315 See merge request !8849
\| * \| \| \| \|	Unify issues search behavior by always filtering when ALL labels matches26315-unify-labels-filter-behavior	Oswaldo Ferreira	2017-02-20	2	-2/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-document-timecop' into 'master'	Rémy Coutable	2017-02-20	1	-0/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document Timecop usage for time-sensitive tests See merge request !9383
\| * \| \| \| \| \|	Document Timecop usage for time-sensitive testsrs-document-timecop	Robert Speicher	2017-02-20	1	-0/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'authentiq-backchannel-logout' into 'master'	Douwe Maan	2017-02-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remote logout functionality on Authentiq OAuth provider See merge request !9381
\| * \| \| \| \| \| \|	Added support for Authentiq Back-Channel Logout	Alexandros Keramidas	2017-02-20	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'artifactsdoc' into 'master'	Robert Speicher	2017-02-20	1	-3/+28
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added documentation for permalinks to most recent build artifacts Closes #27361 See merge request !8934
\| * \| \| \| \| \| \|	Added documentation for permalinks to most recent build artifacts	Christian Godenschwager	2017-02-20	1	-3/+28
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Documented how to download single files from most recent artifacts - Documented how to browse most recent artifacts
* \| \| \| \| \| \|	Merge branch 'pedro-fix-line-ending' into 'master'	Clement Ho	2017-02-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong line ending [ci-skip] See merge request !9270
\| * \| \| \| \| \| \|	Fix wrong line ending [ci-skip]pedro-fix-line-ending	Pedro Moreira da Silva	2017-02-17	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'api-star-restful' into 'master'	Rémy Coutable	2017-02-20	2	-3/+4
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Closes #28328 See merge request !9328
\| * \| \| \| \| \| \|	API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restful	Robert Schilling	2017-02-20	2	-3/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-grammar' into 'master'	Robert Speicher	2017-02-20	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some grammar in the API docs See merge request !9379
\| * \| \| \| \| \| \| \|	Fix some grammar in the API docs	Robert Schilling	2017-02-20	2	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'link-to-rspec-features-docs' into 'master'	Rémy Coutable	2017-02-20	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to external documentation of rspec-rails feature specs See merge request !8973
\| * \| \| \| \| \| \| \|	Add more links in the Features/Integration testing documentation	Richard Macklin	2017-02-13	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move the rspec-rails feature spec link to the Features/Integration section - Mention and link to capybara and poltergeist there as well [ci skip]
\| * \| \| \| \| \| \| \|	Add link to external documentation of rspec-rails feature specs	Richard Macklin	2017-02-03	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]