delta/gitlab/gitlab-ce.git/app/views/discussions, branch bootstrap-markdown-code-highlightgitlab.com: gitlab-org/gitlab-ce.git
Merge branch 'master' into bootstrap42018-05-16T17:46:52+00:00Clement HoClemMakesApps@gmail.com2018-05-16T17:46:52+00:00fcae43c604cb903c11a2cf6c27824e47f315831a
Rename btn-secondary to btn-default2018-05-10T19:22:56+00:00Annabel Dunstone Grayannabel.dunstone@gmail.com2018-05-10T19:22:56+00:00bed783ac15453f60651f861803bba93c622625ba
Reorder discussion timestamp information for issues2018-05-04T07:42:42+00:00George Tsiolistsiolis.g@gmail.com2018-04-26T09:06:31+00:0077a925f4a6bff04f0b40255e4dced741818149d7
[skip ci] Merge branch 'master' into bootstrap42018-04-17T17:24:25+00:00Clement HoClemMakesApps@gmail.com2018-04-17T17:24:25+00:00694b290a2e1f85c62452835edde0a01348096935
Adds padding to the error block2018-04-16T17:48:53+00:00Filipa Lacerdafilipa@gitlab.com2018-04-16T17:48:53+00:00e49aaf838a017d576b27d117cc298a99a313c0ac
Disable try again button while fetching the API2018-04-16T15:36:24+00:00Filipa Lacerdafilipa@gitlab.com2018-04-16T15:36:24+00:004b2ff003920cff431ef4e3e8b0436aa924b34fda
Use different class for try again button in collapsed diffs2018-04-16T11:30:46+00:00Filipa Lacerdafilipa@gitlab.com2018-04-16T11:30:46+00:008f189df86f6ebd2bd4974ce180ed75e9d97cd81e
Render only one error message per diff2018-04-13T08:50:35+00:00Filipa Lacerdafilipa@gitlab.com2018-04-13T08:16:06+00:00a236b5e6a22cf762354a9bb3460e6bad80ab5b3f
Move html to haml file instead of JS
Move html to haml file instead of JS
Fixes unresolved discussions rendering the error state instead of the diff2018-04-12T16:29:54+00:00Filipa Lacerdafilipa@gitlab.com2018-04-12T16:29:54+00:00b01fd7ad81524b5f2773ccba4b5789a6074ffb9d