1da71cc520
Introduce shortcuts for routing helpers
2015-02-25 19:34:16 -08:00
5a8d8b6f20
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/dashboard/projects.html.haml
2015-02-22 07:55:30 -07:00
87b04868a1
Create Aside js class for handling all sidebars in UI for mobile devices
2015-02-21 22:01:27 -08:00
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
50df9a7cb9
Minor css improvements
...
* lighter color for comments count
* better UI for issue assigee.milestone block
2015-02-20 00:11:25 -08:00
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
896c046217
Affix assignee/milestone block
2015-02-17 16:14:49 -08:00
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
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
fd41e39906
Votes block has less priority than assignee/milestone
2015-01-18 19:42:09 -08:00
88b480174c
Improve issue/mr page for tablets
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 14:46:18 +02: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
Dmitriy Zaporozhets