delta/gitlab/gitlab-ce.git, branch feature-flags

Use feature flags for notes and award emojis

2016-06-10T11:19:43+00:00

This allows us to disable creating/updating/removing of notes as well as
toggling of award emojis.

Added simple feature flag system

2016-06-10T11:19:36+00:00

This can be used to enable/disable certain features using the
ApplicationSetting model.

Features can be toggled from the application settings UI, or via a Ruby
script of sorts. Since this re-uses the ApplicationSetting model the
cached settings are flushed automatically.

Merge branch 'award-emoji-fixes' into 'master'

2016-06-09T23:21:50+00:00


Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550

Minor MR comment fixes.

2016-06-09T22:56:41+00:00

yes -> true
no -> false
. frequent -> .frequent-emojis

Update CHANGELOG for 8.8.4 and 8.8.5

2016-06-09T22:42:15+00:00

[ci skip]

Merge branch 'fix-issue-15259-postgresql' into 'master'

2016-06-09T22:35:47+00:00


Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.
    
Closes #15259

See merge request !4577

Merge branch 'milestone-tooltip' into 'master'

2016-06-09T22:10:51+00:00


Add milestone expire date to the right sidebar

## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.

## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/17355

## Screencast
![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)

See merge request !4448

Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

2016-06-09T22:06:19+00:00

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.

Closes #15259

Merge branch 'autocomplete-comment-fix' into 'master'

2016-06-09T21:47:45+00:00


Checks for undefined when inserting autocomplete into textarea

## What does this MR do?

Correctly checks for undefined before inserting anything into the textarea when using autocomplete. This happens because the loading indicator tries to insert `@undefined` which we dont want to insert.

See merge request !4561

Merge branch 'fix_issue_15259' into 'master'

2016-06-09T21:44:10+00:00


Fix bug with SQL syntax error during backup restoration

## What does this MR do?
It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup.

## Are there points in the code the reviewer needs to double check?
Please check compatibility with PostgreSQL

## Why was this MR needed?
Fix an issue with backups can not be restored if MySQL is used as database for GitLab.

## What are the relevant issue numbers?
#15259 

## Screenshots (if relevant)
-

See merge request !4318