<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch docs/refactor-ssh-keys</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>First take on refactoring the SSH keys docs</title>
<updated>2016-09-06T21:44:26+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-09-06T21:44:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6952a6d76f9421c1238b052b49c8959453bf195c'/>
<id>6952a6d76f9421c1238b052b49c8959453bf195c</id>
<content type='text'>
- Split ssh/README.md to user/profile/ssh_keys.md and user/project/deploy_keys.md
- Deprecate gitlab-basics/create-your-ssh-keys.md and move its info in user/profile/ssh_keys.md
- Change links in views
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- Split ssh/README.md to user/profile/ssh_keys.md and user/project/deploy_keys.md
- Deprecate gitlab-basics/create-your-ssh-keys.md and move its info in user/profile/ssh_keys.md
- Change links in views
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-height' into 'master'</title>
<updated>2016-09-06T17:13:08+00:00</updated>
<author>
<name>Annabel Dunstone Gray</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-09-06T17:13:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1e042ac251119c5e3b0ef8e76f3a6d9420fba98b'/>
<id>1e042ac251119c5e3b0ef8e76f3a6d9420fba98b</id>
<content type='text'>

Changed `.commit-row-title` `line-height` to `1.35` from `1`

## What does this MR do?

Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

Not enough space between commit lines

## What are the relevant issue numbers?

Closes #18851.

## Screenshots (if relevant)

New screenshot below.

## Does this MR meet the acceptance criteria?

- [ ] [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)
Closes #18851

See merge request !5996</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Changed `.commit-row-title` `line-height` to `1.35` from `1`

## What does this MR do?

Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

Not enough space between commit lines

## What are the relevant issue numbers?

Closes #18851.

## Screenshots (if relevant)

New screenshot below.

## Does this MR meet the acceptance criteria?

- [ ] [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)
Closes #18851

See merge request !5996</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'improve-vuejs-resource-interceptor' into 'master'</title>
<updated>2016-09-06T16:33:24+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-06T16:33:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=af66fefc376db8b7e392ed249105ba6ce597e025'/>
<id>af66fefc376db8b7e392ed249105ba6ce597e025</id>
<content type='text'>

Reduce intermittent spec failures by making VueJS resource interceptor decrement outstanding resource counts when HTTP response is received

Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response.

Partial fix to #21197 and other intermittent spec failures.

See merge request !6224</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Reduce intermittent spec failures by making VueJS resource interceptor decrement outstanding resource counts when HTTP response is received

Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response.

Partial fix to #21197 and other intermittent spec failures.

See merge request !6224</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'cleanup-mislignments-issue-list-view' into 'master'</title>
<updated>2016-09-06T14:57:27+00:00</updated>
<author>
<name>Annabel Dunstone Gray</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-09-06T14:57:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aa152e4a275434949ade20d20b5dc30d23d1bba9'/>
<id>aa152e4a275434949ade20d20b5dc30d23d1bba9</id>
<content type='text'>

increased checkbox and filter button padding

## What does this MR do?

fixed misalignments as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

## Are there points in the code the reviewer needs to double check?

Not that I know of

## Why was this MR needed?

https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

## Screenshots (if relevant)

![image](/uploads/e7c5ffe78e1a5b67fa0335ba1c231df2/image.png)

![image](/uploads/1591ed872e765da3b5ed071c8872194f/image.png)

## Does this MR meet the acceptance criteria?

- [x] [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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] 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)


## What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

See merge request !6206</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

increased checkbox and filter button padding

## What does this MR do?

fixed misalignments as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

## Are there points in the code the reviewer needs to double check?

Not that I know of

## Why was this MR needed?

https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

## Screenshots (if relevant)

![image](/uploads/e7c5ffe78e1a5b67fa0335ba1c231df2/image.png)

![image](/uploads/1591ed872e765da3b5ed071c8872194f/image.png)

## Does this MR meet the acceptance criteria?

- [x] [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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] 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)


## What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

See merge request !6206</pre>
</div>
</content>
</entry>
<entry>
<title>Changed `.commit-row-title` `line-height` to `1.35` from `1`</title>
<updated>2016-09-06T14:56:33+00:00</updated>
<author>
<name>Luke Bennett</name>
<email>lukeeeebennettplus@gmail.com</email>
</author>
<published>2016-08-24T22:05:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=328fba3d119ecb41c0bd2454399eaef4fc9db670'/>
<id>328fba3d119ecb41c0bd2454399eaef4fc9db670</id>
<content type='text'>
Removed `margin-bottom`

Corrected commit-actions margin

Reverted action margin for a more logical approach
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Removed `margin-bottom`

Corrected commit-actions margin

Reverted action margin for a more logical approach
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'change-checkout-locally-url' into 'master'</title>
<updated>2016-09-06T14:52:26+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-06T14:52:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5a3ccf22c553f2d5c1ee196ff6931b3518127977'/>
<id>5a3ccf22c553f2d5c1ee196ff6931b3518127977</id>
<content type='text'>

Change "check out, review, and merge locally" URL to SSH by default.

## What does this MR do?

Change the default URL type  in the "Check out, review, and merge locally" pop-up dialog to SSH.

## Why was this MR needed?

The default URL to show on the project screen is the SSH URL, so it makes sense for it to be the default here too. Plus, since most people (hopefully) use SSH keys to avoid typing credentials repeatedly, changing this default means these commands can be pasted into a terminal more easily since no password prompt will get in the way.

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [n/a ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [n/a] API support added
- Tests
  - [n/a] Added for this feature/bug
  - [X] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 !6211</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Change "check out, review, and merge locally" URL to SSH by default.

## What does this MR do?

Change the default URL type  in the "Check out, review, and merge locally" pop-up dialog to SSH.

## Why was this MR needed?

The default URL to show on the project screen is the SSH URL, so it makes sense for it to be the default here too. Plus, since most people (hopefully) use SSH keys to avoid typing credentials repeatedly, changing this default means these commands can be pasted into a terminal more easily since no password prompt will get in the way.

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [n/a ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [n/a] API support added
- Tests
  - [n/a] Added for this feature/bug
  - [X] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 !6211</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update-gitlab-git' into 'master'</title>
<updated>2016-09-06T14:52:12+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-09-06T14:52:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f0fc5ba588964c1e8aced25da857b56c22eb0f90'/>
<id>f0fc5ba588964c1e8aced25da857b56c22eb0f90</id>
<content type='text'>

Updated gitlab_git to 10.6.3

## What does this MR do?

This updated gitlab_git to 10.6.3

## Does this MR meet the acceptance criteria?

- [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- Tests
  - [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)

## What are the relevant issue numbers?

See merge request !6132</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Updated gitlab_git to 10.6.3

## What does this MR do?

This updated gitlab_git to 10.6.3

## Does this MR meet the acceptance criteria?

- [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- Tests
  - [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)

## What are the relevant issue numbers?

See merge request !6132</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'zj-gitorious-migration-empty-pg-database' into 'master'</title>
<updated>2016-09-06T14:07:57+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-06T14:07:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=83cd3d79ea306dbcb1ed6f74b9591cb580b94fc6'/>
<id>83cd3d79ea306dbcb1ed6f74b9591cb580b94fc6</id>
<content type='text'>

Support empty PG database too

cc @rdavila @axil

See merge request !6221</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Support empty PG database too

cc @rdavila @axil

See merge request !6221</pre>
</div>
</content>
</entry>
<entry>
<title>Change "check out, review, and merge locally" URL to use default clone protocol.</title>
<updated>2016-09-06T13:58:32+00:00</updated>
<author>
<name>Judson Neer</name>
<email>judson.neer@gmail.com</email>
</author>
<published>2016-09-05T21:46:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b5d4511cf587ad9a3dc8e885536498d6c6c4e2dd'/>
<id>b5d4511cf587ad9a3dc8e885536498d6c6c4e2dd</id>
<content type='text'>
Using the default protocol here (vs HTTP only) is more convenient
when it comes to pasting these commands into a terminal.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Using the default protocol here (vs HTTP only) is more convenient
when it comes to pasting these commands into a terminal.
</pre>
</div>
</content>
</entry>
<entry>
<title>Updated gitlab_git to 10.6.3</title>
<updated>2016-09-06T13:42:24+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-09-06T13:16:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=86892793ca20356a0aaf9b2405eae1b9402ebf84'/>
<id>86892793ca20356a0aaf9b2405eae1b9402ebf84</id>
<content type='text'>
This allows us to take advantage of
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This allows us to take advantage of
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.
</pre>
</div>
</content>
</entry>
</feed>
