delta/gitlab/gitlab-ce.git/spec/controllers, branch absorb-gitlab-git

Merge branch '21992-disable-access-requests-by-default' into 'master'

2016-11-16T14:50:45+00:00


Disable the "request access" functionality by default for new groups and projects

Currently this feature is enabled by default, and additional action is required to disable it.

Closes #21992 
Closes !7011

See merge request !7425

Merge branch '21076-deleted-merged-branches' into 'master'

2016-11-15T12:08:22+00:00


Add button to delete all merged branches

## What does this MR do?

It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs.

**Note**  
~~This MR is WIP until MR !6408 is merged.~~

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

The UX of the actual "Delete merged branches" button.

## Why was this MR needed?

Fixes #21076

## Screenshots
![Branches page without "Delete all merged" button](/uploads/3a2936a83c3547a0fce92a74af880a2d/Screen_Shot_2016-10-17_at_20.06.30.png)

Before:
![Screen_Shot_2016-10-17_at_20.07.11](/uploads/55efcebf4e0a45dbfc70ba4a11ca152c/Screen_Shot_2016-10-17_at_20.07.11.png)


After:

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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
  - [x] 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)

## What are the relevant issue numbers?

Closes #21076

See merge request !6449

Merge branch 'fix-help-page-links' into 'master'

2016-11-14T10:45:56+00:00


Fix error links in help index page when access it with url `http://gitlab.example.com/help/` which have an extra slash 

Fixes #24349

See merge request !7396

fix error links in help page

2016-11-12T13:45:45+00:00

Ensure labels are loaded on "show" methods of MR

2016-11-11T18:06:43+00:00

Previously, they were only being loaded on the actual `show` action, but
not the actions representing the tabs (commits, builds, etc).

Make access request specs explicitly enable or disable access requests as required

2016-11-11T15:45:47+00:00

Add button to delete all merged branches

2016-11-09T20:04:03+00:00

It adds a button to the branches page that the user can use to delete
all the branches that are already merged. This can be used to clean up
all the branches that were forgotten to delete while merging MRs.

Fixes #21076.

Merge branch 'use-separate-token-for-incoming-email' into 'master'

2016-11-08T10:47:45+00:00


Use separate email-friendly token for incoming email

See merge request !5914

implements reset incoming email token on issues modal and account page,

2016-11-07T15:56:18+00:00

reactivates all tests and writes more tests for it

Add tests for project#index routing

2016-11-07T14:13:36+00:00

Signed-off-by: Dmitriy Zaporozhets