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.

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

Add welcome message to features #7286

Merged
merged 1 commit into from
Jan 29, 2020

Conversation

Tlazypanda
Copy link
Collaborator

Fixes #7277

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

@Tlazypanda Tlazypanda requested a review from a team as a code owner January 18, 2020 06:43
@codecov
Copy link

codecov bot commented Jan 18, 2020

Codecov Report

Merging #7286 into master will increase coverage by 0.26%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7286      +/-   ##
==========================================
+ Coverage   81.59%   81.86%   +0.26%     
==========================================
  Files          97       97              
  Lines        5602     5602              
==========================================
+ Hits         4571     4586      +15     
+ Misses       1031     1016      -15
Impacted Files Coverage Δ
app/models/tag.rb 97.46% <ø> (+0.46%) ⬆️
app/controllers/admin_controller.rb 78.05% <ø> (-0.1%) ⬇️
app/models/user.rb 91.05% <100%> (+0.03%) ⬆️
app/controllers/users_controller.rb 82.1% <100%> (+0.76%) ⬆️
app/models/comment.rb 76.95% <100%> (+0.16%) ⬆️
app/controllers/user_sessions_controller.rb 66.45% <100%> (-1.25%) ⬇️
app/controllers/tag_controller.rb 80.31% <0%> (+0.31%) ⬆️
app/models/spamaway.rb 94.87% <0%> (+2.56%) ⬆️
... and 1 more

@Tlazypanda
Copy link
Collaborator Author

@jywarren not sure if these are all the changes required 😅 ..can you help review this and point in the right direction? Thanks 😄

@@ -39,6 +39,9 @@
%>
<% if is_new_contributor %>
<div id="new_contributor_msg">
<% cache('feature_welcome-msg', skip_digest: true) do %>
<%= feature("welcome-msg") %>
<% end %>
<p><i class="fa fa-hand-peace-o" aria-hidden="true"></i>
<%= author %> is a new contributor. Take care in
Copy link
Member

Choose a reason for hiding this comment

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

So, actually we can remove the message you've added, and I can add it directly to the database so that it becomes the current feature text. Then we can merge your code and next time it's published, it'll pick up the text!

@Tlazypanda
Copy link
Collaborator Author

@jywarren is this alright?

@Tlazypanda
Copy link
Collaborator Author

@jywarren the travis failure seems to be unrelated to my changes can you kindly check?

@cesswairimu
Copy link
Collaborator

Restarting travis

@Tlazypanda
Copy link
Collaborator Author

@jywarren not sure why the tests are failing can you help me out?Thanks ✌️ Not really sure if this is how the feature is to be implemented 😅

@jywarren
Copy link
Member

Huh. Very odd! I can't seem to get it to pass - you're totally right it's unrelated. Let me try again... sorry!!!

@Tlazypanda
Copy link
Collaborator Author

@jywarren Ohh 😅 no issues 😄 any workaround for this ?

@jywarren
Copy link
Member

☹️ I'm not sure! I tried retriggering again. If that doesn't work, would you mind rebasing this over the latest master branch?

@plotsbot
Copy link
Collaborator

plotsbot commented Jan 29, 2020

1 Warning
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
2 Messages
📖 @Tlazypanda Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 #
Screenshots 📸 (click to expand)

7286-test_questions.png

7286-test_embeddable_grids.png

7286-test_signup.png

7286-test_viewing_the_settings_page.png

7286-test_tag_by_author_page.png

7286-test_wiki_page_with_inline_grids.png

7286-test_stats.png

7286-test_viewing_the_dashboard.png

7286-test_searching_an_item_from_the_homepage.png

7286-test_signup_modal_form_validation.png

7286-test_tag_stats.png

7286-test_login_modal_form_validation.png

7286-test_questions_shadow.png

7286-test_login_modal.png

7286-test_profile_page.png

7286-test_comments.png

7286-test_tags.png

7286-test_signup_modal.png

7286-test_wiki.png

7286-test_methods.png

7286-test_tag_page.png

7286-test_blog_page_with_location_modal.png

7286-test_tag_wildcard.png

7286-test_signup_modal_disabled_submit_button_on_empty_username.png

7286-test_embeddable_thumbnail_grids.png

7286-test_front_page_with_navbar_search_autocomplete.png

7286-test_spam_moderation_page.png

7286-test_login.png

7286-test_viewing_the_dropdown_menu.png

7286-test_viewing_question_post.png

7286-test_mobile_displays.png

7286-test_simple-data-grapher_powertag.png

7286-test_front.png

7286-test_question_page.png

7286-test_tag_contributors_page.png

7286-test_blog.png

7286-test_people.png

7286-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

@jywarren
Copy link
Member

Hooray!!! It worked! Sorry this was so bad!

🎉 ❤️ 💥

@jywarren jywarren merged commit 2c74313 into publiclab:master Jan 29, 2020
@jywarren
Copy link
Member

Thanks for your patience!!!

vinitshahdeo pushed a commit to vinitshahdeo/plots2 that referenced this pull request Feb 1, 2020
NitinBhasneria pushed a commit to NitinBhasneria/plots2 that referenced this pull request Feb 5, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add welcoming message as a feature
4 participants