delta/gitlab/gitlab-ce.git, branch show-commit-status-from-source-project

Make sure merge request was created before deleting source

2016-10-24T17:56:39+00:00

Also keep commits from source_project around, feedback:

2016-10-24T16:08:30+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6658#note_17190236

Merge remote-tracking branch 'upstream/master' into show-commit-status-from-source-project

2016-10-24T15:56:09+00:00

* upstream/master: (368 commits)
  Use root_url for issue boards user link
  removes extra line for empty milestone description
  code formatting corrected
  Fix reply-by-email not working due to queue name mismatch
  Remove duplicate code in repository cache clearing
  Expire and build repository cache after project import
  refactor(email): use setter method instead AR callbacks
  Move spec/mailers/shared/notify.rb to spec/support
  Fix status code expectation
  Stop clearing the database cache on rake cache:clear
  Fix error in generating labels
  Fix bug where e-mails were not being sent out via Sidekiq
  Document link syntax introduced by !5586
  Fix documents and comments on Build API `scope`. #23146 #19131
  adds entry in CHANGELOG
  removes extra line for empty issue description
  Re-organize queues to use for Sidekiq
  Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks
  Update CHANGELOG
  Fix object data to be sent to fetch analytics data
  ...

Merge branch 'issue-boards-user-url' into 'master'

2016-10-24T11:02:27+00:00


Use root_url for issue boards user link

## What does this MR do?

Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories. 

## What are the relevant issue numbers?

Closes #23556

See merge request !7018

Merge branch 'remove-callback' into 'master'

2016-10-24T10:58:03+00:00


This MR removes AR before_validation callback in favor setter.

## Why was this MR needed?

Because setters is good practice to normalize model attributes instead AR callbacks. Because new object should be valid right after initialization. 
If it MR interested I can try to find other places where we can use setters.

See merge request !6763

Merge branch '#22609' into 'master'

2016-10-24T10:52:22+00:00


Moves `spec/mailers/shared/notify.rb` to `spec/support/notify_shared_examples.rb`

Closes #22609 

See merge request !6605

Merge remote-tracking branch 'origin/sh-flush-cache-after-import'

2016-10-24T10:00:08+00:00

Merge branch 'sh-fix-mailroom-config' into 'master'

2016-10-24T09:50:13+00:00


Fix reply-by-email not working due to queue name mismatch

See merge request !7068

Use root_url for issue boards user link

2016-10-24T09:36:58+00:00

Closes #23556

Merge branch '23557-remove-extra-line-for-empty-issue-description' into 'master'

2016-10-24T09:21:21+00:00


removes extra line for empty description

## What does this MR do?
This MR removes an odd line for empty description 
## Are there points in the code the reviewer needs to double check?
Not necessary
## Why was this MR needed?
Improve UX 
## Screenshots (if relevant)
**Before**
![ss__2016-10-19_at_11.04.45_PM](/uploads/12b376c772115c2e5eef2fe0c0d1992f/ss__2016-10-19_at_11.04.45_PM.png)
**After**
![edi](/uploads/89fea59ef5267974af4cbe1064dc521a/edi.png)
## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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
  - [ ] Added for this feature/bug
  - [ ] 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 it does - 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 #23557 #23695

See merge request !7045