Jacob Schatz ae6b44cf31 Merge branch '15104-mobile-comment-bug' into 'master' ...

Discussion note icon shows up when you click on diff on touch screen

Fixes #15104 

* Fix bug that stopped discussion note button from showing up on iOS
* Shifted button a few `px` to fix slight cutoff
<div>
<img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px">
<img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px">
</div>

See merge request !3755

2016-04-20 18:22:21 +00:00

..

assets

Merge branch '15104-mobile-comment-bug' into 'master'

2016-04-20 18:22:21 +00:00

controllers

Merge branch 'slack_wiki_notifications' into 'master'

2016-04-20 08:12:48 +00:00

finders

Standardised the output of the JSON to always include the name

2016-03-29 11:59:13 +01:00

helpers

Merge branch 'backport_changes_from_ee' into 'master'

2016-04-20 16:38:11 +00:00

mailers

Merge branch 'mr-formatting' into 'master'

2016-04-19 16:23:41 +00:00

models

Verify the MR being displayed question has a merge commit set and can be cherry-picked

2016-04-20 14:28:19 +02:00

services

Fix wiki tests

2016-04-20 08:25:41 +08:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch 'issue_15366' into 'master'

2016-04-20 16:08:30 +00:00

workers

Merge branch 'feature/system_hook_push' into 'master'

2016-04-19 09:34:47 +00:00