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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add missing link to sidekiq metrics in API README	Achilleas Pipinellis	2016-06-21	1	-0/+1
\| \| \| \|	[ci skip]
*	fixup! updated docs for api endpoint award emoji	Z.J. van de Weg	2016-06-17	2	-23/+187
\|
*	Add endpoints for award emoji on notes	Z.J. van de Weg	2016-06-17	1	-0/+204
\| \| \| \|	Docs also added.
*	Correct Sidekiq Metrics Docs	Patricio Cano	2016-06-17	1	-0/+152
\|
*	Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens	Timothy Andrew	2016-06-16	6	-259/+538
\|\
\| *	Merge branch 'doc/issue-move-assigns-labels-and-milestone' into 'master'	Achilleas Pipinellis	2016-06-15	1	-0/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for assigning labels/milestone when moving issue Extends https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3934 See merge request !4069
\| \| *	Add docs for assigning labels/milestone when moving issue	Grzegorz Bizon	2016-06-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'artifacts-expire-date' into 'master'	Rémy Coutable	2016-06-14	1	-239/+289
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Artifacts expire date What do you think @grzesiek? The syntax will be simple: ``` job: artifacts: expire_in: 7d ``` - [x] Implement `expire_in` - [x] Check current design of expiry information with @jschatz1 and @markpundsack - [x] Add tests in GitLab application for a `ExpireBuildArtifactsWorker` and for `ArtifactsController::keep` - [x] Add user documentation how to use `artifacts:expire_in` - [x] Prepare GitLab Runner changes to pass `expire_in`: gitlab-org/gitlab-ci-multi-runner!191 - [x] Fix `timeago` with help of @jschatz1 - [x] Merge latest master after builds view changes @iamphill - [ ] Add Omnibus support for `expire_build_artifacts_worker` cron job - [ ] Add documentation how to configure `expire_build_artifacts_worker` This is based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4201. See merge request !4200
\| \| * \|	Improve design based on review	Kamil Trzcinski	2016-06-13	1	-264/+264
\| \| \| \|
\| \| * \|	Added keep artifacts API endpoint	Kamil Trzcinski	2016-06-13	1	-0/+50
\| \| \| \|
\| * \| \|	Fix grammar and syntax	Achilleas Pipinellis	2016-06-14	1	-6/+8
\| \| \| \|
\| * \| \|	Update CI API docs	Achilleas Pipinellis	2016-06-14	4	-20/+244
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move ci/api under api/ci - Clean up builds.md and runners.md - Replace old links with new ones - Add CI API links in ci/README.md
* \| \|	Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens	Timothy Andrew	2016-06-14	1	-1/+12
\|\ \ \ \| \|/ /
\| * \|	Fix Error 500 when using closes_issues API with an external issue tracker	Stan Hu	2016-06-11	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #18484
* \| \|	Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens	Timothy Andrew	2016-06-09	2	-4/+31
\|\ \ \ \| \|/ /
\| * \|	Document the API endpoint for gathering a build log	Mark Fletcher	2016-06-03	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \|	* Resolves #18015
\| * \|	Add `sha` parameter to MR accept API	Sean McGivern	2016-06-01	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `sha` parameter is optional, and when present, must match the current HEAD SHA of the source branch. Otherwise, the API call fails with a 409 Conflict and a message containing the current HEAD for the source branch. Also tidy up some doc wording.
* \| \|	Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens	Timothy Andrew	2016-06-03	7	-11/+87
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'doc_api_services_jira_amend' into 'master'	Rémy Coutable	2016-06-01	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Amend jira service api docs [ci skip] ## What does this MR do? Amends the API documentation for jira service integration ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? The current documentation omits the username and password parameters ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !4382
\| \| * \|	Amend jira service api docs [ci skip]	Richard Grainger	2016-05-31	1	-0/+2
\| \| \| \|
\| * \| \|	Add Application Setting to configure Container Registry token expire delay ↵	Kamil Trzcinski	2016-05-31	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(default 5min)
\| * \| \|	Add space after comma, add space between 'beautomatically'	Chris Spicer	2016-05-29	1	-2/+2
\| \| \| \|
\| * \| \|	Add space between 'Criticalissue'	Chris Spicer	2016-05-29	1	-1/+1
\| \|/ /
\| * \|	fix group members api doc: remove emial	Sanster	2016-05-21	1	-2/+0
\| \| \|
\| * \|	Merge branch 'master' into 'master'	Hannes Rosenögger	2016-05-18	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix example urls for (dis)associating runners to projects See merge request !2993
\| \| * \|	fix example urls for (de)associating runners to projects	a-tal	2016-02-26	1	-2/+2
\| \| \| \|
\| * \| \|	Make it clearer that /licenses is the OS license templates endpointimprove-license-doc	Rémy Coutable	2016-05-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Merge branch 'docker-registry' into 'master'	Douwe Maan	2016-05-16	1	-0/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
\| \| * \ \	Merge remote-tracking branch 'origin/master' into docker-registry	Kamil Trzcinski	2016-05-13	5	-18/+111
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # config/initializers/1_settings.rb
\| \| * \| \| \|	Update docs/api/projects.md with container registry enabled option	Kamil Trzcinski	2016-05-09	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Change all occurrences of doc.gitlab.com to docs.gitlab.com	Achilleas Pipinellis	2016-05-13	1	-1/+1
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Add API endpoints for un/subscribing from/to a label	Ahmad Sherif	2016-05-12	1	-0/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15638
* \| \| \| \|	Reuse the private token param and header for personal access tokens.	Timothy Andrew	2016-05-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3749#note_11626427 - Personal access tokens are still a separate entity as far as the codebase is concerned - they just happen to use the same entry point as private tokens. - Update tests and documentation to reflect this change
* \| \| \| \|	Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens	Timothy Andrew	2016-05-11	5	-35/+96
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Merge branch 'patch-1' into 'master'"	Rémy Coutable	2016-05-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !4030
\| * \| \| \|	Expose MergeRequest#user_notes_count in the API and use the method in issues ↵	Rémy Coutable	2016-05-09	1	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	API: Expose Issue#user_notes_count	cnam-dep	2016-05-09	1	-5/+10
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-05-09	1	-22/+58
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	docs(api): adapted user API documentation to match with latest API	Fabio Huser	2016-05-06	1	-22/+58
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation. Signed-off-by: Fabio Huser <fabio@fh1.ch>
\| * \| \|	Update build triggers API documentation (#10153)	Thomas Wood	2016-05-08	1	-1/+11
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update build triggers API documentation [ci skip] * Ensure updated/deleted timestamps are consistent
\| * \|	Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'	Douwe Maan	2016-05-04	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.lock
\| \| * \|	API support for the 'since' and 'until' operators on commit requests	Paco Guzman	2016-04-29	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	- Parameter validation as ISO8601 format
\| * \| \|	Made it clearer that issue_id means iid, not id.	Aral Balkan	2016-05-04	1	-5/+5
\| \|/ /
* \| \|	Add documentation for personal access tokens.	Timothy Andrew	2016-04-28	1	-24/+37
\|/ /
* \|	Continue implementation of the license template selector and /licenses API ↵	Rémy Coutable	2016-04-18	2	-0/+148
\| \| \| \| \| \| \| \| \| \| \| \|	endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Allow back dating notes on creation	Michael Greene	2016-04-13	1	-0/+1
\| \|
* \|	Allow back dating issues on update	Michael Greene	2016-04-13	1	-0/+1
\| \|
* \|	Merge branch 'api-subscribe-issue-mr' into 'master'	Rémy Coutable	2016-04-13	2	-0/+257
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Subscribe and unsubscribe from issues and merge requests * Closes #6024 This MR is based on !3611, which must be merged first. See merge request !3615
\| * \|	Ensure that issues and merge requests are found	Robert Schilling	2016-04-13	1	-0/+1
\| \| \|
\| * \|	Make subscription API more RESTful	Robert Schilling	2016-04-13	2	-27/+28
\| \| \|