delta/gitlab/gitlab-ce.git/doc, branch add-docker-debugging-docs gitlab.com: gitlab-org/gitlab-ce.git Grammar improvements 2016-08-02T22:24:15+00:00 Stan Hu stanhu@gmail.com 2016-08-02T22:24:15+00:00 2c9cce0feb8bd4e10f3406493eff30e783782d15 [ci skip] 
[ci skip]
Add a note about setting up an insecure registry 2016-08-02T22:20:46+00:00 Stan Hu stanhu@gmail.com 2016-08-02T22:20:36+00:00 46385e4e5a88a4ac614f680094b9226778cee64a [ci skip] 
[ci skip]
Add guide for debugging issues with the Docker container registry 2016-08-02T15:15:20+00:00 Stan Hu stanhu@gmail.com 2016-08-02T05:57:15+00:00 d707c91f706a26ff30b9d4862bb2c50b45a35fff [ci skip] 
[ci skip]
Update installation guide for 8.11 2016-08-01T23:38:41+00:00 Ruben Davila rdavila84@gmail.com 2016-08-01T23:38:41+00:00 6cee51903dc39b8071594d83ac0703ccfe4388fd 






API methods should be documented using Grape's DSL

2016-08-01T13:52:51+00:00

Rémy Coutable
remy@rymai.me

2016-08-01T13:52:51+00:00

8bcdc4b185d70bfb2a50d22ec99a26c2c463a2f8


See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2397#note_13491048





See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2397#note_13491048






Merge branch 'patch-3' into 'master'

2016-08-01T12:48:09+00:00

Rémy Coutable
remy@rymai.me

2016-08-01T12:48:09+00:00

74d4f3deb8360f16af83ee596bbbcadaa39e7a05


Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code

## What does this MR do?

Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code 

## Why was this MR needed?
Using the example when provided the parameter grant_type=AUTHORIZATION_CODE the server returns a error:
```json 
{"error":"unsupported_grant_type","error_description":"The authorization grant type is not supported by the authorization server."}
```


See merge request !5539





Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code

## What does this MR do?

Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code 

## Why was this MR needed?
Using the example when provided the parameter grant_type=AUTHORIZATION_CODE the server returns a error:
```json 
{"error":"unsupported_grant_type","error_description":"The authorization grant type is not supported by the authorization server."}
```


See merge request !5539






Merge branch 'zj-env-external-url' into 'master'

2016-08-01T09:04:09+00:00

Rémy Coutable
remy@rymai.me

2016-08-01T09:04:09+00:00

f46d5f5813f5c0fe9c88435c8bda9af08447ef16


Add an URL field to Enviroments

## What does this MR do?

Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review. 

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

The field is a string on the database, thus limited to 255 chars, which seems more than enough.

## What are the relevant issue numbers?

Closes #19527

## Screenshots (if relevant)

![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5469





Add an URL field to Enviroments

## What does this MR do?

Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review. 

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

The field is a string on the database, thus limited to 255 chars, which seems more than enough.

## What are the relevant issue numbers?

Closes #19527

## Screenshots (if relevant)

![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5469






Merge branch 'document-yaml-colon' into 'master'

2016-08-01T08:02:40+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-08-01T08:02:40+00:00

a5fdee61b6dd94cc6d0e87db59dcc7e554f0a796


Clarify CI script needing to quote colons

## What does this MR do?

Clarifies documentation for `.gitlab-ci.yml` `script`.

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

Should this be a note? Is there a link to YAML spec we can point to?

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #20177.

## Screenshots (if relevant)


See merge request !5481





Clarify CI script needing to quote colons

## What does this MR do?

Clarifies documentation for `.gitlab-ci.yml` `script`.

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

Should this be a note? Is there a link to YAML spec we can point to?

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #20177.

## Screenshots (if relevant)


See merge request !5481






Merge branch 'master' into 'master'

2016-08-01T06:56:16+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-08-01T06:56:16+00:00

2f344eca42f1f0fa8ac122316687bc166c489bf1


Update start-using-git.md to reflect that merges to master can be made from either the master or the named branch.

## What does this MR do?

The documentation is incorrect in stating that you need to be in the named branch in order to merge to master.  You can be in master and merge the named branch, too.

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

Yes

## Why was this MR needed?

This MR is needed to correct an inaccuracy in the documentation.

## What are the relevant issue numbers?

N/A

## Screenshots (if relevant)

N/A

## Does this MR meet the acceptance criteria?

It is only a documentation change, so mostly this is not applicable.

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

See merge request !5404





Update start-using-git.md to reflect that merges to master can be made from either the master or the named branch.

## What does this MR do?

The documentation is incorrect in stating that you need to be in the named branch in order to merge to master.  You can be in master and merge the named branch, too.

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

Yes

## Why was this MR needed?

This MR is needed to correct an inaccuracy in the documentation.

## What are the relevant issue numbers?

N/A

## Screenshots (if relevant)

N/A

## Does this MR meet the acceptance criteria?

It is only a documentation change, so mostly this is not applicable.

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

See merge request !5404






Use Grape DSL for environment endpoints
2016-07-29T18:35:38+00:00

Z.J. van de Weg
zegerjan@gitlab.com

2016-07-29T10:14:36+00:00

1b72256fa14e65256d78347f81b289d43c44e991

Also a couple of minor edits for this branch are included





Also a couple of minor edits for this branch are included