<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch 20895-inline-comments-for-first-commit</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Fix line commenting for the initial commit</title>
<updated>2016-08-19T14:05:47+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-08-19T14:05:47+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=91336f399bdd716aece8bcd8d28fdd354f86695b'/>
<id>91336f399bdd716aece8bcd8d28fdd354f86695b</id>
<content type='text'>
The initial commit doesn't have a parent, so explicitly pass the blank
SHA and handle that when calculating the position.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The initial commit doesn't have a parent, so explicitly pass the blank
SHA and handle that when calculating the position.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '21039-member-invite-declined-email-wrong-arguments' into 'master'</title>
<updated>2016-08-19T12:22:46+00:00</updated>
<author>
<name>Rubén Dávila Santos</name>
<email>ruben@gitlab.com</email>
</author>
<published>2016-08-19T12:22:46+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=12e9df327042f3b368878d14f6e18e51b9f668b9'/>
<id>12e9df327042f3b368878d14f6e18e51b9f668b9</id>
<content type='text'>

Fix notification_service argument error of declined invitation emails

## What does this MR do?

Remove unused arguments that raised the argument error after a refactor, more details in the commit message.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #21039

## Screenshots (if relevant)

## 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
  - [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 !5893</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix notification_service argument error of declined invitation emails

## What does this MR do?

Remove unused arguments that raised the argument error after a refactor, more details in the commit message.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #21039

## Screenshots (if relevant)

## 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
  - [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 !5893</pre>
</div>
</content>
</entry>
<entry>
<title>Fix notification_service argument error of declined invitation emails</title>
<updated>2016-08-19T11:18:13+00:00</updated>
<author>
<name>Paco Guzman</name>
<email>pacoguzmanp@gmail.com</email>
</author>
<published>2016-08-19T10:44:20+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=681f9aca39101109edb3b46a14282b007d68e69b'/>
<id>681f9aca39101109edb3b46a14282b007d68e69b</id>
<content type='text'>
Removing unused access_level parameter.

Bug introduced here -&gt; 6d103a2f4764441b1650ba6d790732056c9a8516
access_level parameter wasn’t needed since -&gt; 88c2639356e6e4b4b05d96584768e07a9ce4b048</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Removing unused access_level parameter.

Bug introduced here -&gt; 6d103a2f4764441b1650ba6d790732056c9a8516
access_level parameter wasn’t needed since -&gt; 88c2639356e6e4b4b05d96584768e07a9ce4b048</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'labels-grammar' into 'master'</title>
<updated>2016-08-19T05:54:41+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-08-19T05:54:41+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=12fe6a6fd733110acc72aa0f5bdaec2b1fa1f358'/>
<id>12fe6a6fd733110acc72aa0f5bdaec2b1fa1f358</id>
<content type='text'>

Fix same tiny grammar mistake as in ee

This is a tiny grammar fix that was already merged into EE

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/667#note_14043471

See merge request !5865</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix same tiny grammar mistake as in ee

This is a tiny grammar fix that was already merged into EE

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/667#note_14043471

See merge request !5865</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'diff-line-comment-vuejs' into 'master'</title>
<updated>2016-08-19T02:24:34+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-08-19T02:24:34+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=579951720afcfa7d2fbef6f3dc2d2ca0d2816025'/>
<id>579951720afcfa7d2fbef6f3dc2d2ca0d2816025</id>
<content type='text'>

Diff line comments resolve

## What does this MR do?

Diff line comments can be resolved.

Part of #10325 

To do:

- [x] Backend (@DouweM)
  - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331
  - [x] System note when all discussions are resolved
  - [x] Notification when all discussions are resolved
  - [x] Write unit tests
  - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9
- [x] Frontend (@iamphill)
  - [x] Fix bugs
  - [x] Write more feature tests 
- [x] Frontend (@connorshea)
  - [x] Address frontend feedback
  - [x] Feature specs for Jump feature
  - [x] Documentation
  - [x] Add Vue.js in a standard way

See merge request !5022</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Diff line comments resolve

## What does this MR do?

Diff line comments can be resolved.

Part of #10325 

To do:

- [x] Backend (@DouweM)
  - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331
  - [x] System note when all discussions are resolved
  - [x] Notification when all discussions are resolved
  - [x] Write unit tests
  - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9
- [x] Frontend (@iamphill)
  - [x] Fix bugs
  - [x] Write more feature tests 
- [x] Frontend (@connorshea)
  - [x] Address frontend feedback
  - [x] Feature specs for Jump feature
  - [x] Documentation
  - [x] Add Vue.js in a standard way

See merge request !5022</pre>
</div>
</content>
</entry>
<entry>
<title>Fix expansion of discussions in diff</title>
<updated>2016-08-19T01:49:25+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-08-19T00:54:50+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=10c5ec3e57d9a1a5a0477102dd7aa4cba0645b64'/>
<id>10c5ec3e57d9a1a5a0477102dd7aa4cba0645b64</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Improve performance of MR show page</title>
<updated>2016-08-19T00:08:59+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-08-18T23:27:22+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6a355d451eaca2fc10f5fcf31de13b05fa795b9b'/>
<id>6a355d451eaca2fc10f5fcf31de13b05fa795b9b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-update-doorkeeper' into 'master'</title>
<updated>2016-08-18T23:23:21+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-08-18T23:23:21+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c5aa31c83145366d88ce6d8d91e68467cf5baed4'/>
<id>c5aa31c83145366d88ce6d8d91e68467cf5baed4</id>
<content type='text'>

Update doorkeeper to 4.2.0

Changelog: https://git.io/v6PnV

See merge request !5881</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update doorkeeper to 4.2.0

Changelog: https://git.io/v6PnV

See merge request !5881</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '2fa-check-git-http' into 'master'</title>
<updated>2016-08-18T23:18:58+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-08-18T23:18:58+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a59c33e4a3c492bdf05c67be47a5ba14d40e7bb8'/>
<id>a59c33e4a3c492bdf05c67be47a5ba14d40e7bb8</id>
<content type='text'>

2FA checks for Git over HTTP

## What does this MR do?

This MR allows the use of `PersonalAccessTokens` to access Git over HTTP and makes that the only allowed method if the user has 2FA enabled. If a user with 2FA enabled tries to access Git over HTTP using his username and password the request will be denied and the user will be presented with the following message:

```
remote: HTTP Basic: Access denied
remote: You have 2FA enabled, please use a personal access token for Git over HTTP.
remote: You can generate one at http://localhost:3000/profile/personal_access_tokens
fatal: Authentication failed for 'http://localhost:3000/documentcloud/underscore.git/'
```

## What are the relevant issue numbers?

Fixes #13568 

See merge request !5764</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

2FA checks for Git over HTTP

## What does this MR do?

This MR allows the use of `PersonalAccessTokens` to access Git over HTTP and makes that the only allowed method if the user has 2FA enabled. If a user with 2FA enabled tries to access Git over HTTP using his username and password the request will be denied and the user will be presented with the following message:

```
remote: HTTP Basic: Access denied
remote: You have 2FA enabled, please use a personal access token for Git over HTTP.
remote: You can generate one at http://localhost:3000/profile/personal_access_tokens
fatal: Authentication failed for 'http://localhost:3000/documentcloud/underscore.git/'
```

## What are the relevant issue numbers?

Fixes #13568 

See merge request !5764</pre>
</div>
</content>
</entry>
<entry>
<title>Fix jumping between discussions on changes tab</title>
<updated>2016-08-18T23:14:47+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-08-18T23:14:47+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ac89bb0fad1d5820c4defd51cb6ab0626d1fb6ba'/>
<id>ac89bb0fad1d5820c4defd51cb6ab0626d1fb6ba</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
