Skip to content
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

Jump to bottom

Issue Resolved: Fix Breaking-link Punctuation at end of URL in Comments #10947 #11048

Merged
merged 6 commits into from
May 29, 2022
Merged

Issue Resolved: Fix Breaking-link Punctuation at end of URL in Comments #10947 #11048

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94aabc2
Added a line just for testing to the README file
rajvidg Apr 8, 2022
1f7390b
Merge branch 'publiclab:main' into main
rajvidg Apr 8, 2022
31bd239
Update comment.rb
rajvidg Apr 9, 2022
d5e9dfd
Update _comment.html.erb
rajvidg Apr 9, 2022
d5ef143
Merge branch 'publiclab:main' into main
rajvidg Apr 11, 2022
96eae96
Update README.md
rajvidg Apr 14, 2022
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PublicLab.org
======
I forked and cloned this repo.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rajvidg Can you remove this file from the PR? Thanks!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rajvidg Can you remove this file from the PR? Thanks!!

Yes I am trying to, watching some tutorials. :'(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rajvidg Can you remove this file from the PR? Thanks!!

I removed the changes and reverted the file to its original one, but it got created as another commit, but the files changes section contains the required files, I tried doing it using git commands but the README file was not showing up in the branch where I committed rest of the changes, can you please look into it. @TildaDares

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rajvidg You've resolved the issue 🎉

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rajvidg You've resolved the issue 🎉

Oh! thank you @TildaDares :))


[![Code of Conduct](https://img.shields.io/badge/code-of%20conduct-green.svg)](https://publiclab.org/conduct)
[![Build Status](https://github.com/publiclab/plots2/workflows/tests/badge.svg?branch=main)](https://github.com/publiclab/plots2/actions)
Expand Down
7 changes: 2 additions & 5 deletions app/models/comment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Comment < ApplicationRecord
def self.inheritance_column
'rails_type'
end

def self.search(query)
Comment.where('MATCH(comment) AGAINST(?)', query)
.where(status: 1)
Expand Down Expand Up @@ -503,10 +503,7 @@ def scrub_quoted_text
end

def render_body
body = RDiscount.new(
title_suggestion(self),
:autolink
).to_html
body = RDiscount.new(title_suggestion(self)).to_html
# if it has quoted email text that wasn't caught by the yahoo and gmail filters,
# manually insert the comment filter delimeter:
parsed = parse_quoted_text
Expand Down
2 changes: 1 addition & 1 deletion app/views/notes/_comment.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@

<% comment_body = comment.render_body %>
<div class="comment-body" id="comment-body-<%= comment.cid %>">
<%= raw insert_extras(filtered_comment_body(comment_body)) %>
<%= raw auto_link(insert_extras(filtered_comment_body(comment_body)), :sanitize => false) %>
</div>

<% if contain_trimmed_body?(comment_body) %>
Expand Down