home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,274 Commits 48 Branches 340 Tags
bcebdee751a76e858afd91ae256c7e6388ec8a7e
Commit Graph
631 Commits
Author SHA1 Message Date
Rémy Coutable b8d75d41aa Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' 
Find all builds for commit if there are multiple pipelines for it

## What does this MR do?

This MR fixes a builds API. When multiple pipelines were triggered for a commit, then API returned builds only from the last pipeline.

## What are the relevant issue numbers?

Closes #18912  
Closes #19243 

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4849
 2016-06-28 17:10:07 +00:00
Achilleas Pipinellis 1ade080ec8 Merge branch 'iankelling-api-doc' into 'master' 
docs: fix default_branch_protection default



See merge request !4479
 2016-06-28 14:57:42 +00:00
Grzegorz Bizon 087f080871 Add documentation for commit builds API improvements 2016-06-28 13:04:11 +02:00
Achilleas Pipinellis 298b4850ba Merge branch 'remove-docs-for-gitlab-ci-service-api' into 'master' 
Remove docs for GitLab CI Service API

## What does this MR do?

Documentation update: http://docs.gitlab.com/ce/api/services.html

Old GitLab CI Service API description will be removed from the docs.

## Are there points in the code the reviewer needs to double check?

n/a

## Why was this MR needed?

Obsolete information is harmful than nothing.

## What are the relevant issue numbers?

Closes #19167

## Does this MR meet the acceptance criteria?

- [n/a] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [n/a] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4927
 2016-06-27 14:33:47 +00:00
Achilleas Pipinellis 0115ab7f40 Merge branch '2979-document-2fa-auth-changes' into 'master' 
Add notices about disabling auth features for users with 2FA.

Related to #2979

- Document the proposed changes to the GitLab authentication system.
- This is done because currently, users with 2FA enabled are allowed API access without a 2FA token.

# Tasks

- [ ]  #2979 !xxxx - Document proposed auth changes for 2FA users
    - [x]  Wait for replies on "[potential avenues for documenting the planned changes](https://gitlab.com/gitlab-org/gitlab-ce/issues/2979#note_12591578)"
    - [x]  Update documentation
    - [ ]  CHANGELOG entry?
    - [ ]  Merge conflicts

See merge request !4815
 2016-06-27 12:15:57 +00:00
Timothy Andrew f7fc352b4a Add notices about disabling auth features for users with 2FA. 2016-06-27 13:48:55 +05:30
Takuya Noguchi 7773fe5b03 Remove docs for GitLab CI Service API 2016-06-27 00:56:17 +09:00
Marc Siegfriedt 6587feba65 gitlab-org/gitlab-ce#17818 - add api call for issues by group 
rely only on IssuesFinder
docs and changelog
 2016-06-23 16:31:48 +00:00
Achilleas Pipinellis 4b1e505ef8 Add missing link to sidekiq metrics in API README 
[ci skip]
 2016-06-21 19:21:13 +02:00
Z.J. van de Weg e0bdcd2f2f fixup! updated docs for api endpoint award emoji 2016-06-17 22:03:57 +02:00
Z.J. van de Weg 05a4a586b5 Add endpoints for award emoji on notes 
Docs also added.
 2016-06-17 21:02:51 +02:00
Patricio Cano 33b66f9ce6 Correct Sidekiq Metrics Docs 2016-06-17 11:19:03 -05:00
Timothy Andrew 90bba2bc46 Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens 2016-06-16 08:27:37 +05:30
Achilleas Pipinellis 870470730c Merge branch 'doc/issue-move-assigns-labels-and-milestone' into 'master' 
Add docs for assigning labels/milestone when moving issue

Extends https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3934

See merge request !4069
 2016-06-15 09:36:19 +00:00
Grzegorz BizonandAchilleas Pipinellis 0daa6b4321 Add docs for assigning labels/milestone when moving issue 
[ci skip]
 2016-06-15 11:33:09 +02:00
Rémy Coutable 95a7fbe97c Merge branch 'artifacts-expire-date' into 'master' 
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
 2016-06-14 13:40:01 +00:00
Achilleas Pipinellis f2f5a115c6 Fix grammar and syntax 2016-06-14 14:50:25 +02:00
Achilleas Pipinellis 47c9b7d34c Update CI API docs 
- 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
 2016-06-14 14:47:32 +02:00
Timothy Andrew d0bcba1105 Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens 2016-06-14 09:06:53 +05:30
Kamil TrzcinskiandPhil Hughes 421be01dab Improve design based on review 2016-06-13 11:09:19 +01:00
Kamil TrzcinskiandPhil Hughes 6013768fec Added keep artifacts API endpoint 2016-06-13 11:07:23 +01:00
Stan Hu a85dde9182 Fix Error 500 when using closes_issues API with an external issue tracker 
Closes #18484
 2016-06-11 19:50:08 -07:00
Timothy Andrew 1779d68bfe Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens 2016-06-09 14:40:14 +05:30
Ian Kelling 733193abba docs: fix default_branch_protection default 2016-06-05 04:27:05 -07:00
Mark Fletcher 2e8f039ae9 Document the API endpoint for gathering a build log 
* Resolves #18015
 2016-06-03 18:56:26 +01:00
Timothy Andrew ae0d8222af Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens 2016-06-03 09:31:16 +05:30
Sean McGivern d863d86aeb Add sha parameter to MR accept API 
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.
 2016-06-01 20:29:54 +01:00
Rémy Coutable adcbd00135 Merge branch 'doc_api_services_jira_amend' into 'master' 
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
 2016-06-01 09:09:37 +00:00
Richard Grainger 024227bdbf Amend jira service api docs [ci skip] 2016-05-31 17:28:20 +01:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Chris Spicer 556a41660e Add space after comma, add space between 'beautomatically' 2016-05-29 22:31:22 -07:00
Chris Spicer 1b0367a422 Add space between 'Criticalissue' 2016-05-29 22:30:47 -07:00
Sanster 69a07cf4d4 fix group members api doc: remove emial 2016-05-21 22:33:54 +08:00
Hannes Rosenögger 7254fb9e2b Merge branch 'master' into 'master' 
fix example urls for (dis)associating runners to projects



See merge request !2993
 2016-05-18 21:54:01 +00:00
Rémy Coutable f7bdbc0b55 Make it clearer that /licenses is the OS license templates endpoint 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 00:07:51 -05:00
Douwe Maan 59e62fc486 Merge branch 'docker-registry' into 'master' 
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
 2016-05-16 17:20:31 +00:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry 
# Conflicts:
#	config/initializers/1_settings.rb
 2016-05-13 17:14:46 -05:00
Achilleas Pipinellis 9eb4569ed9 Change all occurrences of doc.gitlab.com to docs.gitlab.com 
[ci skip]
 2016-05-13 16:26:56 -05:00
Ahmad Sherif 0c22698bd4 Add API endpoints for un/subscribing from/to a label 
Closes #15638
 2016-05-12 22:48:09 +02:00
Timothy Andrew d915e7d5ca Reuse the private token param and header for personal access tokens. 
- 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
 2016-05-11 10:16:23 +05:30
Timothy Andrew 2e9742997d Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens 2016-05-11 09:52:58 +05:30
Kamil Trzcinski 9f679ac207 Update docs/api/projects.md with container registry enabled option 2016-05-09 20:35:25 +03:00
Rémy Coutable 63c45fa75b Revert "Merge branch 'patch-1' into 'master'" 
This reverts merge request !4030
 2016-05-09 15:21:23 +00:00
Rémy Coutable f5240f9703 Expose MergeRequest#user_notes_count in the API and use the method in issues list 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-09 16:08:07 +02:00
cnam-depandRémy Coutable 5364400741 API: Expose Issue#user_notes_count 2016-05-09 16:07:35 +02:00
Dmitriy Zaporozhets 618033fb2f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-05-09 14:57:39 +02:00
Thomas WoodandAchilleas Pipinellis e129df53e1 Update build triggers API documentation (#10153) 
Update build triggers API documentation
[ci skip]

* Ensure updated/deleted timestamps are consistent
 2016-05-08 11:38:24 +03:00
Fabio HuserandFabio Huser 76f43d5ce2 docs(api): adapted user API documentation to match with latest API 
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>
 2016-05-06 11:50:51 +02:00
Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits' 
# Conflicts:
#	Gemfile.lock
 2016-05-04 17:27:47 +02:00
Aral Balkan 82b5bb9117 Made it clearer that issue_id means iid, not id. 2016-05-04 06:58:40 +00:00