delta/gitlab/gitlab-ce.git/config, branch ref-dropdown-jquery-objects

add missing import source

2016-06-21T11:35:37+00:00

Merge branch 'feature/runner-lock-on-project' into 'master'

2016-06-21T10:08:42+00:00


Make it possible to lock runner on a specific project

Make it possible to lock runner on a specific project.

![Screen_Shot_2016-06-20_at_4.03.08_PM](/uploads/186378643a20106ff0b67b6fd8bd7f28/Screen_Shot_2016-06-20_at_4.03.08_PM.png)

----

![Screen_Shot_2016-06-20_at_9.54.52_PM](/uploads/c479abdffaf19f383bb6b5a42bdd6cc3/Screen_Shot_2016-06-20_at_9.54.52_PM.png)

----

![Screen_Shot_2016-06-20_at_9.56.26_PM](/uploads/6ad838679b0c28a1fe2e20e9224387ea/Screen_Shot_2016-06-20_at_9.56.26_PM.png)

Closes #3407

See merge request !4093

Merge branch 'async-refs-dropdown' into 'master'

2016-06-20T19:10:47+00:00


Refs dropdown is now loaded async

## What does this MR do?

The refs dropdown is loaded async so not to block the page.

## What are the relevant issue numbers?

Part of #18202

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png)

See merge request !4508

Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project

2016-06-20T14:04:14+00:00

* upstream/master: (353 commits)
  Put some admin settings in dropdown
  Add styleguide on configuration settings documentation
  Remove Duplicated keys add UNIQUE index to fingerprint
  Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
  Move appearance settings as sub tab to application settings
  use rails root join
  fixed a couple of errors spotted in production
  Fix RangeError exceptions when referring to issues or merge requests outside of max database values
  Fix bug in `WikiLinkFilter`.
  Grammar and typographic changes to artifacts documentation
  Tweak grammar
  Small frontend code fixes and restore 8a2d88f commit
  Warn about admin privilege to disable GitHub Webhooks
  Listing GH Webhooks doesn't stop import process for non GH admin users
  fixup! updated docs for api endpoint award emoji
  Update CHANGELOG
  Ensure Todos counters doesn't count Todos for projects pending delete
  Add endpoints for award emoji on notes
  Sort API endpoints and implement feedback
  Add endpoints for Award Emoji
  ...

Avoid autoload issue such as 'Mail::Parsers::AddressStruct'

2016-06-20T10:43:29+00:00

By eager-loading the Mail gem in the Sidekiq initializer.

Signed-off-by: Rémy Coutable

Refs dropdown is now loaded async

2016-06-18T20:49:20+00:00

Merge branch 'issue_12758' into 'master'

2016-06-17T23:28:22+00:00


Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389

Merge branch 'issuable-todo-improvements'

2016-06-17T22:42:36+00:00

# Conflicts:
#	app/controllers/projects/todos_controller.rb

Removed update method

2016-06-17T17:31:37+00:00

Re-structured controller spec
Renamed issuable param to issuable_id

Merge master into issue_12758

2016-06-17T17:29:11+00:00