delta/gitlab/gitlab-ce.git/app, branch diff-table-width-fix

Fixed large comments messing with diff table widths

2016-09-12T13:44:16+00:00

Closes #20694

Merge branch '21814-fix' into 'master'

2016-09-10T15:54:51+00:00


Pull import sources from Gitlab::ImportSources

## What does this MR do?
`ApplicationSettings.create_from_defaults` defines an array of import sources, but we should be pulling them from `Gitlab::ImportSources.options` since that's what they're validated against.

## What are the relevant issue numbers?

Closes #21814

See merge request !6293

Merge branch 'enable-pipeline-events-by-default' into 'master'

2016-09-09T19:07:16+00:00


Enable pipeline events by default

This should probably be included in !5620 but missed.

See merge request !6278

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

Merge branch 'branches-mr-button-permissions' into 'master'

2016-09-09T18:31:46+00:00


Hides merge request button on branches page

## What does this MR do?

 If user does not have the correct permissions, the merge request button is hidden

## What are the relevant issue numbers?

Closes #21805

See merge request !6181

Pull import sources from Gitlab::ImportSources

2016-09-09T15:54:20+00:00

Merge branch '20300-restore-comments' into 'master'

2016-09-09T13:37:17+00:00


Restore comments lost when converting CoffeeScript to JavaScript

## What does this MR do?

Restores comments lost in the great fire of !5464.

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

## Why was this MR needed?

#20300

## What are the relevant issue numbers?

 - #20300 (comments)
 - #20098 (ES6)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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)
Closes #20300

See merge request !5541

Enable pipeline events by default

2016-09-09T12:41:06+00:00

Not sure why I missed this before. I thought I added it.

Merge branch 'gitlab-workhorse-safeties' into 'master'

2016-09-09T11:33:08+00:00


Security and safety improvements for gitlab-workhorse integration

Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60

- Use a custom content type when sending data to gitlab-workhorse
- Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse

This will allow us to build features in gitlab-workhorse that require
more trust, and protect us against programming mistakes in the future.

This is designed so that no action is required for installations from
source. For omnibus-gitlab we need to add code that manages the shared
secret.

See merge request !5907

Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into 'master'

2016-09-09T09:57:31+00:00


Refresh todos count cache when an Issue/MR is deleted

Fixes #21714

See merge request !6161