delta/gitlab/gitlab-ce.git/app/controllers/concerns, branch koding-setting-api

Merge branch 'rc-new-members-approve-request-access-service' into 'master'

2016-09-27T12:10:12+00:00


New `Members::ApproveAccessRequestService`

Part of #21979.

## Does this MR meet the acceptance criteria?

- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 !6266

Ensure Members::ApproveAccessRequestService can fin a requester by ID

2016-09-22T13:50:48+00:00

Signed-off-by: Rémy Coutable

New Members::ApproveAccessRequestService

2016-09-22T13:50:47+00:00

Signed-off-by: Rémy Coutable

Revert part of "Merge branch 'update_issues_mr_counter' into 'master'

2016-09-22T13:43:43+00:00

Signed-off-by: Rémy Coutable

Merge branch 'and-you-get-awards' into 'master'

2016-09-21T15:22:28+00:00


And Snippets get awards

## What does this MR do?

Makes snippets more awesome, by making them awardables

## Why was this MR needed?

Because Snippets were left behind.

## What are the relevant issue numbers?

Closes #17878

See merge request !4456

fix issues mr counter

2016-09-20T13:39:15+00:00

Start Frontend work, fix routing problem

2016-09-19T16:50:40+00:00

Snippets get award emoji! :thumbsup:

2016-09-19T16:47:43+00:00

fixes distinction between renaming a file and updating its content and

2016-09-10T03:05:30+00:00

refactors update file

Merge branch 'add-remember-option-u2f' into 'master'

2016-09-09T18:42:11+00:00


Pass the remember_me option into the u2f form and support it while authenticating

## What does this MR do?

Adds remember me support in the u2f authentication, and makes sure the flag gets passed from the login form to the u2f form.

Based on the changes for the same thing done for regular 2fa: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4369

## Why was this MR needed?

The remember me option wasn't working for u2f devices (yubikey)

## What are the relevant issue numbers?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18103

See merge request !5918