delta/gitlab/gitlab-ce.git, branch diff-comments-toggle-tooltip-hide

Hides tooltip on discussion toggle button when clicking

2016-09-12T08:52:14+00:00

Closes #20750

Merge branch '19359-api-for-notification-settings' into 'master'

2016-09-12T07:45:36+00:00


Add notification_settings API calls

## What does this MR do?
It adds API calls to get/update notification settings, globally and at the group/project level.

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

## Why was this MR needed?
Notification settings were updated, but related API calls were never created.

## What are the relevant issue numbers?
gitlab-org/gitlab-ce#19359

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

Closes #19359

See merge request !5632

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 'pipelines-finder-spec-fix' into 'master'

2016-09-10T01:26:32+00:00


Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs

Fixes failed builds such as https://gitlab.com/gitlab-org/gitlab-ce/builds/3919501

See merge request !6291

Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs

2016-09-09T20:21:46+00:00

Fixes failed builds such as https://gitlab.com/gitlab-org/gitlab-ce/builds/3919501

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 'restrict_ldap_return_attributes' into 'master'

2016-09-09T18:59:33+00:00


Restrict ldap return attributes

## What does this MR do?

Fixes the CE part of #13821. We really only ever need uid, dn, cn, and mail attributes, and in some cases, even less. This merge request strips the request down to those four attributes by default, and allows the caller to specify others, if needed. 

## Why was this MR needed?

This will improve performance especially in cases where the connection is slow between GitLab and LDAP, or when the LDAP object has lots of attributes we don't care about.

See merge request !6187

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 'rs-changelog-archive' into 'master'

2016-09-09T18:39:41+00:00


Archive CHANGELOG entries prior to 8.0 in CHANGELOGS/archive.md

[ci skip]

See merge request !6162

Add changelogs/unreleased/.gitkeep

2016-09-09T18:37:25+00:00

See gitlab-org/release-tools!29

[ci skip]