# Conflicts:
#	app/assets/javascripts/todos.js.coffee

Instrument Banzai code

See merge request !3659

Fix scroll bars shown in Revert dialogue box


## What does this MR do?

Eliminate scroll bars shown in Revert dialogue box, see the screenshots.

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

N/A

## Why was this MR needed?

Ugly scroll bars are shown in Revert dialogue box.

## What are the relevant issue numbers?

N/A

## Screenshots

![Screen_Shot_2016-04-05_at_15.27.10](/uploads/428295858ada7cd2fcdf1e831c42f8ec/Screen_Shot_2016-04-05_at_15.27.10.png)



See merge request !3532

Go back to gitlab-workhorse 0.7.1

See merge request !3656

We found out that 0.7.2 breaks shallow `git clone`. GitLab 8.7 will
work fine with gitlab-workhorse 0.7.1 too.

Fixed issue with dashboard/issues not filtering by milestone

Closes #15128

See merge request !3650

Decrease threshold for ABC Size metric in Rubocop

To 55.

References #3444

See merge request !3598

Store block timings as transaction values

See merge request !3649

If the measure method uses Transaction.current directly the SQL
subscriber (Subscribers::ActiveRecord) will add timings of queries
triggered by DB cleaner.

Standardize the way we check for and display form errors

- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.

See merge request !3531

First pass at a Code Review guide

Largely borrowed from thoughtbot's code review guide, so attribution is
included.

[ci skip]

See merge request !3639

Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228

This makes it easier to query, simplifies the code, and makes it
possible to figure out what transaction the data belongs to (simply
because it's now stored _in_ the transaction).

This new setup keeps track of both the real/wall time _and_ CPU time
spent in a block, both measured using milliseconds (to keep all units
the same).

Closes #15128

Remove `random_markdown_tip` helper

Only usage got removed in !3442

See merge request !3637

Correct documentation on enabling artifacts.

The docs say to enable artifacts that settings should be set to "false".  This updates the documents to change the setting to "true".

See merge request !3630

Removed important from css

To 60.

Use false/true mixin in migration from !3640



See merge request !3646

Fix more SQL migrations to use raw commands

gitlab-org/gitlab-development-kit#109

See merge request !3640

Upgrade annotate from 2.6.10 to 2.7.0

We don’t have any tests for this, so no need to run them. [ci skip]

Includes compatibility with Rails 5.

Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0

Working towards #14286.

See merge request !3645

[ci skip]

Upgrade premailer-rails from 1.9.0 to 1.9.2

Includes compatibility with Rails 5.

Changelog:
https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v192

Working towards #14286.

See merge request !3643

Fix seed_fu failure with inserting milestones into test DB

Milestones were not being saved due to "invalid state" validation errors

See merge request !3641

Ignore toggling the sidebar for resolutions over 1200px width

Closes #14353 
![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif)

See merge request !3547

prevent users from being able to both upvote and downvote



See merge request !3495

This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.

gitlab-org/gitlab-development-kit#109