delta/gitlab/gitlab-ce.git/db, branch 20895-inline-comments-for-first-commit

Merge branch 'master' into diff-line-comment-vuejs

2016-08-18T21:43:26+00:00

# Conflicts:
#	db/schema.rb

Merge branch '17334-u2f-device-identifiers' into 'master'

2016-08-18T18:37:56+00:00


Allow naming (and deleting) U2F devices.

## What does this MR do?

- Allow giving each U2F device a name (at the time of registration).
- Allow deleting individual U2F devices.
- Display a list of registered U2F devices.

## What are the relevant issue numbers?

- Closes #17334 
- Closes #17335 

See merge request !5833

Allow naming U2F devices.

2016-08-18T16:42:02+00:00

1. Display a list of U2F devices on the `two_factor_auth` page.

2. Allow deleting individual U2F devices.

3. Allow setting a (optional) name for a device (during registration).

Merge branch 'master' into diff-line-comment-vuejs

2016-08-18T15:21:40+00:00

Merge branch '18141-pipeline-graph' into 'master'

2016-08-17T22:42:58+00:00


Add pipeline graph

## What does this MR do?
Adds pipeline visualization

## What are the relevant issue numbers?
Closes #18141    
Part of #19982 

## Screenshots (if relevant)
![Screen_Shot_2016-08-16_at_7.59.52_PM](/uploads/c9dd695d2ddbd2a85e98a5b4e500d52c/Screen_Shot_2016-08-16_at_7.59.52_PM.png)
![Screen_Shot_2016-08-16_at_7.55.49_PM](/uploads/5ab548cc5fc8a42371d3b54108798c02/Screen_Shot_2016-08-16_at_7.55.49_PM.png)

See merge request !5742

Merge branch 'master' into diff-line-comment-vuejs

2016-08-17T18:10:09+00:00

Merge branch 'issue-boards' into 'master'

2016-08-17T18:02:26+00:00


Issue boards

## What are the relevant issue numbers?

- Issue: #17907 
- Issue backend: #20335 
- Backend MR: !5548
- Frontend MR: !5554
- Documentation !5713 

## Screenshots (if relevant)

## 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 [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5548

Store discussion_id on Note for faster discussion lookup.

2016-08-17T17:16:46+00:00

Merge branch '18681-pipelines-merge-request' into 'master'

2016-08-17T16:49:42+00:00


Resolve "Pipelines for merge request"

## What does this MR do?
Adds `Pipelines` tab in merge request view

## What are the relevant issue numbers?
Closes #18681 

## Screenshots (if relevant)
![Screen_Shot_2016-08-16_at_3.22.41_PM](/uploads/c04febab3765b1fac2bf3bbfb9882f9f/Screen_Shot_2016-08-16_at_3.22.41_PM.png)

See merge request !5485

Ensure that we have only one list per label per board

2016-08-17T15:58:58+00:00