<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/services, branch fix/import-export-gitlab-errors</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>Merge branch 'fix-auto-mr-close' into 'master'</title>
<updated>2016-06-22T01:18:12+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-22T01:18:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a3a8798a1bbc44c8055b2bf91ea94b2260480ef9'/>
<id>a3a8798a1bbc44c8055b2bf91ea94b2260480ef9</id>
<content type='text'>

Fix auto-MR-close text from branch name

## What does this MR do?

Fix the MR-auto-close feature if a branch name begins with an issue IID.

## Are there points in the code the reviewer needs to double check?

It's one line, so check that line thoroughly :smiley:

## Why was this MR needed?

When I create a new MR from a branch starting with an issue IID, the description doesn't get suffixed with the 'Closes #blahblah' that it should do.

## What are the relevant issue numbers?

Don't think there are any.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added

See merge request !4836</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix auto-MR-close text from branch name

## What does this MR do?

Fix the MR-auto-close feature if a branch name begins with an issue IID.

## Are there points in the code the reviewer needs to double check?

It's one line, so check that line thoroughly :smiley:

## Why was this MR needed?

When I create a new MR from a branch starting with an issue IID, the description doesn't get suffixed with the 'Closes #blahblah' that it should do.

## What are the relevant issue numbers?

Don't think there are any.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added

See merge request !4836</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'</title>
<updated>2016-06-22T01:15:29+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-22T01:15:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c11006ac6c395556f7d326a9630d4d32a07005cc'/>
<id>c11006ac6c395556f7d326a9630d4d32a07005cc</id>
<content type='text'>

Resolve "Destroying a project causes post_decline_request to be executed"

## What does this MR do?

Ensure we don't send "access request declined" to access requesters when a project is deleted.

## Are there points in the code the reviewer needs to double check?

I've created a service to decouple the notification sending from the AR model.

## Why was this MR needed?

Because there was an issue.

## What are the relevant issue numbers?

Fixes #18755, #18750.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG needed.
- [x] 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 !4744</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Resolve "Destroying a project causes post_decline_request to be executed"

## What does this MR do?

Ensure we don't send "access request declined" to access requesters when a project is deleted.

## Are there points in the code the reviewer needs to double check?

I've created a service to decouple the notification sending from the AR model.

## Why was this MR needed?

Because there was an issue.

## What are the relevant issue numbers?

Fixes #18755, #18750.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG needed.
- [x] 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 !4744</pre>
</div>
</content>
</entry>
<entry>
<title>Fix auto-MR-close text from branch name</title>
<updated>2016-06-21T16:59:20+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-06-21T16:54:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b2f60bb9a118c366ad462241bd4842c52d872d5f'/>
<id>b2f60bb9a118c366ad462241bd4842c52d872d5f</id>
<content type='text'>
Rails's form helpers use the `$attr_before_type_cast` method where
available, and this value only appears to be updated on assignment, not
when the object is mutated in some other way:

    [1] pry(main)&gt; mr = MergeRequest.new
    =&gt; #&lt;MergeRequest:0x007fcf28395d88 ...&gt;
    [2] pry(main)&gt; mr.description = 'foo'
    =&gt; "foo"
    [3] pry(main)&gt; mr.description &lt;&lt; ' bar'
    =&gt; "foo bar"
    [4] pry(main)&gt; mr.description
    =&gt; "foo bar"
    [5] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo"
    [6] pry(main)&gt; mr.description += ' bar'
    =&gt; "foo bar bar"
    [7] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo bar bar"
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Rails's form helpers use the `$attr_before_type_cast` method where
available, and this value only appears to be updated on assignment, not
when the object is mutated in some other way:

    [1] pry(main)&gt; mr = MergeRequest.new
    =&gt; #&lt;MergeRequest:0x007fcf28395d88 ...&gt;
    [2] pry(main)&gt; mr.description = 'foo'
    =&gt; "foo"
    [3] pry(main)&gt; mr.description &lt;&lt; ' bar'
    =&gt; "foo bar"
    [4] pry(main)&gt; mr.description
    =&gt; "foo bar"
    [5] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo"
    [6] pry(main)&gt; mr.description += ' bar'
    =&gt; "foo bar bar"
    [7] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo bar bar"
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project</title>
<updated>2016-06-20T14:04:14+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2016-06-20T14:04:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aeb24ee87224e3be50001a486734ff4699e0e1af'/>
<id>aeb24ee87224e3be50001a486734ff4699e0e1af</id>
<content type='text'>
* upstream/master: (353 commits)
  Put some admin settings in dropdown
  Add styleguide on configuration settings documentation
  Remove Duplicated keys add UNIQUE index to fingerprint
  Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
  Move appearance settings as sub tab to application settings
  use rails root join
  fixed a couple of errors spotted in production
  Fix RangeError exceptions when referring to issues or merge requests outside of max database values
  Fix bug in `WikiLinkFilter`.
  Grammar and typographic changes to artifacts documentation
  Tweak grammar
  Small frontend code fixes and restore 8a2d88f commit
  Warn about admin privilege to disable GitHub Webhooks
  Listing GH Webhooks doesn't stop import process for non GH admin users
  fixup! updated docs for api endpoint award emoji
  Update CHANGELOG
  Ensure Todos counters doesn't count Todos for projects pending delete
  Add endpoints for award emoji on notes
  Sort API endpoints and implement feedback
  Add endpoints for Award Emoji
  ...
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* upstream/master: (353 commits)
  Put some admin settings in dropdown
  Add styleguide on configuration settings documentation
  Remove Duplicated keys add UNIQUE index to fingerprint
  Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
  Move appearance settings as sub tab to application settings
  use rails root join
  fixed a couple of errors spotted in production
  Fix RangeError exceptions when referring to issues or merge requests outside of max database values
  Fix bug in `WikiLinkFilter`.
  Grammar and typographic changes to artifacts documentation
  Tweak grammar
  Small frontend code fixes and restore 8a2d88f commit
  Warn about admin privilege to disable GitHub Webhooks
  Listing GH Webhooks doesn't stop import process for non GH admin users
  fixup! updated docs for api endpoint award emoji
  Update CHANGELOG
  Ensure Todos counters doesn't count Todos for projects pending delete
  Add endpoints for award emoji on notes
  Sort API endpoints and implement feedback
  Add endpoints for Award Emoji
  ...
</pre>
</div>
</content>
</entry>
<entry>
<title>fixed a couple of errors spotted in production</title>
<updated>2016-06-20T06:58:43+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-06-20T06:58:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cee2a2dc66a16695fad28657d6649e861a3c1be8'/>
<id>cee2a2dc66a16695fad28657d6649e861a3c1be8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member</title>
<updated>2016-06-18T04:06:34+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-17T16:59:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=654565c9dc734a597c525a75c8f72dd63235604b'/>
<id>654565c9dc734a597c525a75c8f72dd63235604b</id>
<content type='text'>
This is a try for a new approach to put the access checks at the service level.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This is a try for a new approach to put the access checks at the service level.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Don't send the "access declined" email on access request withdrawal</title>
<updated>2016-06-18T03:46:45+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-17T14:33:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a08a26ac814d7fd9f7523e22847fab0cc25ceb78'/>
<id>a08a26ac814d7fd9f7523e22847fab0cc25ceb78</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>New Members::DestroyService</title>
<updated>2016-06-18T03:46:45+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-17T12:06:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4652489f40a4ff2b749f9ad495986a7a17448243'/>
<id>4652489f40a4ff2b749f9ad495986a7a17448243</id>
<content type='text'>
This is to ensure we don't send unwanted notifications when deleting a
project. In other words, stop abusing AR callbacks and use services.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This is to ensure we don't send unwanted notifications when deleting a
project. In other words, stop abusing AR callbacks and use services.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue_12758' into 'master'</title>
<updated>2016-06-17T23:28:22+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-17T23:28:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=00906b5bb6cde8cb60281109060a519a54000c61'/>
<id>00906b5bb6cde8cb60281109060a519a54000c61</id>
<content type='text'>

Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18034-cache-todo-counter' into 'master'</title>
<updated>2016-06-17T18:37:43+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-06-17T18:37:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bb4a1ef6c1ed4d367e6126ad64033e0286da6f15'/>
<id>bb4a1ef6c1ed4d367e6126ad64033e0286da6f15</id>
<content type='text'>

Cache todo counters (pending/done)

See merge request !4438</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Cache todo counters (pending/done)

See merge request !4438</pre>
</div>
</content>
</entry>
</feed>
