Commit graph

16 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
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
Ciro Santilli
c0c8dccf2e Export all coffee classes with @ 2014-10-20 23:03:33 +02:00
Dmitriy Zaporozhets
cf1aa36a21 Merge pull request #7979 from mr-vinn/refactor-tasks
Refactor task list tests and coffeescript
2014-10-08 11:37:21 +03:00
Dmitriy Zaporozhets
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
Vinnie Okada
40263a06c1 Refactor task list tests and coffeescript 2014-10-06 19:19:12 -05:00
Vinnie Okada
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
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
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
Ciro Santilli
3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets
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
5cfaf945cd
Improve notes form UI/UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-24 13:06:44 +03:00
Dmitriy Zaporozhets
8e7f80eed1
Restyle merge request accept and ci widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets
1a17289bd3
Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
2014-04-06 13:54:54 +03:00
Dmitriy Zaporozhets
b05a67f4e3
Split merge request coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:22:57 +02:00