a6e073fa9b
Merge branch 'issue-page-keeps-jumping-up' into 'master'
...
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
2016-01-17 17:01:35 +00:00
7b143a81f3
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-13 18:54:11 -05:00
1eb3e8acb6
fixes bug with commenting on merge requests
2016-01-13 16:57:46 -05:00
46b56fc7ec
initial fix
2016-01-13 16:46:40 -05:00
f01d052071
gets merge request discussion working again
2016-01-12 16:29:14 -05:00
fa8b228f9d
restores merge request coffee file
2016-01-12 13:58:10 -05:00
ab9612df8d
initial json requests instead of HTML
2016-01-07 11:47:39 -05:00
cbdc8dd46f
adds ajax open and close merges, with discussion/comments working as well
2016-01-05 20:42:25 -05:00
79c90821ac
Rename .issuable-details to .detail-page (and -header and -description)
2015-12-16 16:13:22 +01:00
f92bbd2f28
Show the first tab automatically on MergeRequests#new
...
Closes #2013
2015-07-18 18:05:07 -04:00
b9fa82daee
Update tests and use js-issuable class for context form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:05:30 +02:00
cbb64a4f63
Fix js error on merge request page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:37:52 +02:00
2d31568b27
Refactor issue and merge request sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:04:50 +02:00
ce20400628
Extract MergeRequest tab behavior to its own JS class
2015-06-17 16:59:50 -04:00
00600a592b
Extract merge request widget JS to separate class
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:27:03 +02:00
d2d8037b1a
Refactor merge request widget step 2
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 15:14:50 +02:00
aa97325dea
Merge branch 'rs-merge-request-tabs-the-third' into 'master'
...
Include location.search and location.hash in URL for replaceState
Forgot these 😊
See merge request !740
2015-05-29 10:23:33 +00:00
7f529ef0f7
Include location.search and location.hash in URL for replaceState
2015-05-29 05:15:09 -04:00
acb7721fe8
Merge branch 'rs-teaspoon' into 'master'
...
Add Teaspoon for Javascript testing
Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.
See https://github.com/modeset/teaspoon
See merge request !715
2015-05-29 09:10:46 +00:00
3f156ed482
Improve MergeRequest tab-persisting behavior
...
Now uses the path instead of the hash.
See discussion in #728 .
2015-05-29 00:27:56 -04:00
73440b0364
Javascripts don't need to require jquery or bootstrap explicitly
2015-05-28 18:22:32 -04:00
5c52eaa9d2
Persist current merge request tab selection via URL
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
2015-05-27 22:39:11 -04:00
d5ee54df16
More JS dependency requirements
2015-05-06 15:31:08 -04:00
ce29e5cd8f
Update task list behavior for Merge Requests
2015-05-06 12:58:27 -04:00
269aee790c
Let Bootstrap's tab JS handle history
...
Closes #2219
2015-04-17 16:42:38 -04:00
aedc12547a
Merge branch 'issue-sidebar-size' into 'master'
...
Changes the width of sidebar in issues and MRs when affix event fires
Fixes #1320
Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom.
See merge request !464
2015-04-03 13:23:11 +00:00
085f12288d
Unbind task item checkbox events and then rebind them
...
Fixes #1340
2015-03-31 17:45:11 -04:00
81ff63d684
Changes the width of sidebar in issues and MRs when affix event fires
2015-03-26 21:23:31 +00:00
35ec08a6e2
Change merge request button color based on CI status
2015-03-24 16:13:29 -07:00
b0e2441330
Improve issue sidebar position
2015-03-20 15:33:13 -07:00
19032c0319
add canceled CI status
2015-03-19 18:27:24 +02:00
27e7534470
Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix
...
[bugfix] Merge request diff view behaviour fix
2015-03-02 14:28:21 -08:00
7fef8456e8
Merge branch 'small-fixes' into 'master'
...
Small fixes
Fixes #2062 and #2061
See merge request !1601
2015-02-26 06:31:50 +00:00
e27f5aef46
Fix sticky diff header
2015-02-25 22:17:46 -08:00
c254cb03d8
Fix affix for issue and merge request with image in description
2015-02-25 20:00:28 -08:00
51b234cfb6
Removed exceeding semicolon
2015-02-20 13:03:28 +02:00
5493e27d53
Fixed merge request diff page after back browser button is pressed.
2015-02-20 13:00:42 +02:00
896c046217
Affix assignee/milestone block
2015-02-17 16:14:49 -08:00
9c03c1c545
Make automerge via satellite
2015-01-09 19:10:01 -08:00
5140a4cd13
Set of UI changes mostly for issue and merge request
...
* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 14:32:49 +02:00
5b49bb208a
Fix issueable context update and fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 16:42:26 +02:00
c0c8dccf2e
Export all coffee classes with @
2014-10-20 23:03:33 +02:00
cf1aa36a21
Merge pull request #7979 from mr-vinn/refactor-tasks
...
Refactor task list tests and coffeescript
2014-10-08 11:37:21 +03:00
593a1b3b3e
Style merge request CI widget to match MR/Issue box
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 15:11:18 +03:00
40263a06c1
Refactor task list tests and coffeescript
2014-10-06 19:19:12 -05:00
9f0083a96c
Add task lists to issues and merge requests
...
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input. Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks. Task status is also displayed in the MR and issue
lists.
2014-10-05 22:15:27 -05:00
4ebe718d69
Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/blob/_remove.html.haml
2014-10-03 13:34:25 +03:00
8e33f9460c
Show test coverage results in MR if available
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 18:17:47 +03:00
3098e7a453
Factor commit message textareas.
2014-10-02 12:03:30 +02:00
8401ec56e3
Show spinner when loading MR diff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:17:06 +03:00
Dmitriy Zaporozhets
Jacob Schatz
Douwe Maan
Robert Speicher
Drew Blessing
Phil Hughes
Valery Sizov
Dmitriy Zaporozhets
krolik
Ciro Santilli
Vinnie Okada