delta/gitlab/gitlab-ce.git/app/assets/javascripts/merge_request.js.coffee, branch api-shared-groups gitlab.com: gitlab-org/gitlab-ce.git Avoid a TypeError when initializing MergeRequest JS class with no arg 2016-06-15T08:33:36+00:00 Rémy Coutable remy@rymai.me 2016-06-15T08:32:57+00:00 8aed815b6e646df52043867edfdfcf4f618c6a87 Without this sane default you would get the following error when you tried to instantiate a new MergeRequest object with no argument (i.e. `new MergeRequest();`): TypeError: undefined is not an object (evaluating 'this.opts.action') Signed-off-by: Rémy Coutable <remy@rymai.me> 
Without this sane default you would get the following error when you
tried to instantiate a new MergeRequest object with no argument (i.e.
`new MergeRequest();`):

TypeError: undefined is not an object (evaluating 'this.opts.action')

Signed-off-by: Rémy Coutable <remy@rymai.me>
Added toolbar to comment form 2016-04-04T09:48:49+00:00 Phil Hughes me@iamphill.com 2016-03-30T09:00:43+00:00 3c2b0e7572c11d24b96f2762a03c8cc47f11f510 






Merge branch 'issue-page-keeps-jumping-up' into 'master'

2016-01-17T17:01:35+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-01-17T17:01:35+00:00

a6e073fa9b0d78181609962b269f8d9d240f99ac


Issue page keeps jumping up

This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top.

See merge request !2417





Issue page keeps jumping up

This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top.

See merge request !2417






fixes scrollbar jump by making discussion the same size as the sidebar when sidebar is bigger, and not allowing affix to do fixed position on the sidebar
2016-01-13T23:54:11+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-13T23:54:11+00:00

7b143a81f38364a90a7e3b86ad461549898245f1












fixes bug with commenting on merge requests
2016-01-13T21:57:46+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-13T21:57:46+00:00

1eb3e8acb61e837768d3aea93ae28b819efb9702












initial fix
2016-01-13T21:46:40+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-13T21:46:40+00:00

46b56fc7ecf7251195dcdba961c3b103664fdd73












gets merge request discussion working again
2016-01-12T21:29:14+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-12T21:29:14+00:00

f01d0520713a2b5cb58511cdda10d459941ac8e9












restores merge request coffee file
2016-01-12T18:58:10+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-12T18:58:10+00:00

fa8b228f9dc391367e9cde8e90bff83dc6396434












initial json requests instead of HTML
2016-01-07T16:47:39+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-07T16:47:39+00:00

ab9612df8dd97d83a94a8290f1530760e5cc7d2e












adds ajax open and close merges, with discussion/comments working as well
2016-01-06T01:42:25+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-01-06T01:42:25+00:00

cbdc8dd46ff2b74e5817053f774cc8f17db55f77