Commit Graph
37 Commits
Author SHA1 Message Date
Phil Hughes e033b9a7f1 Added discard button to comment form
Also changed the labels on the buttons to better match the action they are completing.

Closes #8057
2016-03-04 08:42:22 +00:00
Andy GrantandRobert Speicher aead14b052 Add "issue" to Close/Reopen buttons for clarity 2016-02-22 15:36:48 -05:00
Jacob Schatz d82d3ecd48 adds back in discussion.haml.html for issues commenting and closing/reopening properly. 2016-01-12 15:45:48 -05:00
Jacob Schatz c0220198d1 removing last chunk of MR ajax changes, rest will be in another MR 2016-01-12 15:16:26 -05:00
Jacob Schatz 8e74460534 adds ajax to bottom discussion buttons. Now submits issue and closes via ajax. 2015-12-29 12:53:21 -05:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Dmitriy Zaporozhets 4b7c9c7fe2 Revert sidebar position for issue and merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-17 10:34:15 +01:00
Dmitriy Zaporozhets 3162a5a293 Fix ux issue with "This issue will be closed automatically" message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-17 00:04:29 +01:00
Dmitriy Zaporozhets 1911811438 Move awards back to gray panel and few improvements to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets b0591ff03a Redesign issue page for new sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Robert Speicher 813c9b2aeb Make cross-project reference's clipboard target less naive
See !2023
2015-12-08 15:29:46 -05:00
Douwe Maan 1b5302f8e7 Reduce MR/issue duplication 2015-12-08 13:06:54 +01:00
Douwe Maan 6aa43974d4 Move subscription info below label info in issue/MR sidebar 2015-12-02 14:21:23 +01:00
Robert Speicher 7dab8ed739 Rework the copy_to_clipboard logic
It needed to be more flexible in how we set the target text or element.
2015-11-24 19:12:03 -05:00
Dmitriy Zaporozhets 618b54910e Improve UI for emoji awards
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-19 10:50:38 +01:00
Robert Speicher 187625831f Add "Copy to clipboard" buttons
Adds buttons to the commit list SHAs and the cross-project reference
data on issuables.
2015-10-23 15:31:43 +02:00
Dmitriy Zaporozhets 6887075b2e Style issue page, comments and part of merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 01:25:51 +02:00
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:55:56 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:04:50 +02:00
Dmitriy Zaporozhets a5f23435f7 Improve performance for issue#show page
* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for issue with 10 comments/participants twice.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24 12:49:34 +02:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -04:00
Robert Speicher 5c7b91e29b Single quotes/icon helper in views 2015-05-06 13:00:11 -04:00
Sullivan SENECHAL f28f5e49f6 Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
Douwe Maan e62b5a2b07 Only allow user to see participants from groups they have access to. 2015-04-02 10:57:01 +02:00
Dmitriy Zaporozhets 085e5084a8 Make issue and merge request sidebar more compact
* move votes block to participants
* make smaller font in sidebar
2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets 1da71cc520 Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/projects.html.haml
2015-02-22 07:55:30 -07:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
2015-02-21 12:55:28 -07:00
Dmitriy Zaporozhets 50df9a7cb9 Minor css improvements
* lighter color for comments count
* better UI for issue assigee.milestone block
2015-02-20 00:11:25 -08:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets 896c046217 Affix assignee/milestone block 2015-02-17 16:14:49 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Jason Blanchard 97d4ac4047 Adds link to milestone and keeping resource context on smaller
viewports for issues and merge requests
2015-02-03 11:41:32 -05:00
Dmitriy Zaporozhets fd41e39906 Votes block has less priority than assignee/milestone 2015-01-18 19:42:09 -08:00
Dmitriy Zaporozhets 88b480174c Improve issue/mr page for tablets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 14:46:18 +02: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