Skip to content

Fix layout in Redmine 4.1, add timestamps to merge requests #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix layout in Redmine 4.1, add timestamps to merge requests #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/views/merge_request_links/_merge_request_link.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
class: 'merge-request-id') %>
<%= link_to(merge_request.title, merge_request.url) %>
<span class="merge-request-by-line">
<%= l(:mrl_label_by) %>
<%= content_tag(:span,
merge_request.author_name,
class: 'merge-request-author') %>
<%= l(:label_added_time_by, author: merge_request.author_name, age: time_tag(merge_request.created_at)).html_safe %>,
<%= l(:label_updated_time, time_tag(merge_request.updated_at)).html_safe %>
</span>
<% end %>
9 changes: 1 addition & 8 deletions assets/stylesheets/redmine_merge_request_links.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ div#issue-changesets {
}

div#issue-merge-requests {
float: right;
width: 45%;
margin: 1em 0 2em 1em;
padding-left: 1em;
margin: 1em 0;
}

@media screen and (max-width: 899px) {
Expand Down Expand Up @@ -40,18 +37,15 @@ div#issue-merge-requests {
}

.merge-request-id {
display: block;
color: #444;
}

.merge-request a {
display: block;
font-weight: bold;
margin: 4px 0;
}

.merge-request-state {
display: inline-block;
background-color: #5aa51d;
color: #fff;
font-weight: bold;
Expand All @@ -69,7 +63,6 @@ div#issue-merge-requests {
}

.merge-request-by-line {
display: block;
color: #888;
}

Expand Down
7 changes: 7 additions & 0 deletions db/migrate/20200827093954_add_timestamps_to_merge_request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class AddTimestampsToMergeRequest < ActiveRecord::Migration[5.2]
def change
change_table :merge_requests do |t|
t.timestamps
end
end
end
3 changes: 1 addition & 2 deletions lib/redmine_merge_request_links/hooks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ def view_layouts_base_html_head(_context = {})
plugin: 'redmine_merge_request_links')
end

render_on(:view_issues_show_after_details,
partial: 'merge_request_links/box')
render_on(:view_issues_show_description_bottom, partial: 'merge_request_links/box')
end
end