delta/gitlab/gitlab-ce.git, branch 18608-lock-issues-fe

delta/gitlab/gitlab-ce.git, branch 18608-lock-issues-fe gitlab.com: gitlab-org/gitlab-ce.git Fix schema.rb 2017-09-12T12:20:32+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-09-12T12:20:32+00:00 9f7b6c986114241431d79321da619778da27d293

Revert incorrect diffs 2017-09-12T12:15:03+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-09-12T12:15:03+00:00 0bb79ccbe2f289e5b6ba419d6e127f878208ed8e

Merge branch '18608-lock-issues' into 18608-lock-issues-fe 2017-09-12T11:29:18+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-09-12T11:29:18+00:00 72785c1cbb1e8b1568331ae0c67b50cc504026d6

Merge remote-tracking branch 'origin/master' into 18608-lock-issues 2017-09-12T11:17:33+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-09-12T11:17:33+00:00 811c60bd458aa6dd4f626fef500d5c0e9f1adfd0

Review changes 2017-09-12T11:10:55+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-09-07T22:37:31+00:00 045acdb9f9839b1f144649fb72fe54b90c3f1ba9

update changelog 2017-09-12T11:10:55+00:00 Jarka Kadlecova jarka@gitlab.com 2017-09-07T20:20:30+00:00 a630d52b35fe3463d9d3893762a1905c98e93955

remove not necessary import 2017-09-12T11:10:55+00:00 Jarka Kadlecova jarka@gitlab.com 2017-09-07T16:36:13+00:00 3a73f13d96f13e1f8d7bad1d1cb3a710d53287c8

use downcase instead of underscore 2017-09-12T11:10:55+00:00 Jarka Kadlecova jarka@gitlab.com 2017-09-07T16:03:41+00:00 374c73ba9d9603059047d258476ca9c4dca81643

add feature specs for discussion lock 2017-09-12T11:10:55+00:00 Jarka Kadlecova jarka@gitlab.com 2017-09-07T15:53:52+00:00 176dd1a6843098cd8e9716bef6e9d8a22b3140b3

Disable comment form when discussion locked for user 2017-09-12T11:10:55+00:00 Jarka Kadlecova jarka@gitlab.com 2017-09-07T15:14:21+00:00 197417e09c0e72cc92a1d9a238af1fa8c10e1621