rebased by standing at my rails-4.2 branch #266
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Lock paperclip to required version * Exclude critical files * Disable magic comment * Safe navigate on params * Move Style/FrozenStringLiteralComment to .rubocop.yml * Rubocop autofix
* form http request changes to post * Tests for long answer using POST request * Commented test for GET request * Uncommented the test for large answers
…bliclab#2109) * Fixes #publiclab#2079 Fixes publiclab#2079 This commit adds active user tab to publiclab.org/spam. * Add people tab to /spam page for moderators(Fixes publiclab#2079)
* Added links to the profile page * Stats display
* Update _sidebar.html.erb * Update I18n_test.rb
* Update typeahead_service.rb * Update typeahead_service.rb * Update restful_typeahead.js * Update revision.rb
* chg: added button to join the powertag group's tag * add: added check to see if current_user is available before showing the button * fix: added defined? to check if the curre_user variable is defined * fix: added defined? check to see if the current_user variable is defined * chg: modified redirection for the create action * chg: added button for when the user is not currently logged in * add: added current_user as a parameter * fix: added defined? to check if the curre_user variable is defined * chg: added button for when the user is not currently logged in * text tweaks * tweak * Update user_tags_controller_test.rb * Update wiki_controller_test.rb * Update node_shared.rb * Update application_helper.rb * Hopefully fix test failures * Update application_helper.rb
…ab#2078) * Refactor code for user's social links * Fix Relationship tests * Add validations to Relationship model
) * Make tags visible to other users (fixes publiclab#2138) publiclab#2138 The profile tags are currently only visible to the user themselves or to admins. The tags should be visible to everyone, while the "add tags" input should maintain its current visibility status (owner or administrator). * Add a parent param to the tag/tagging partial. This cleverly hides the input but only if it is rendered inside the profile view. * Improve the condition * If parent is unset, set parent to nil
* Add ruby-2.3.0 alert to README.md * made it as a small note * change from 2.3.0 to 2.3.4 * small change * Changed bundle install statement
* RSS feed * Added changes
* Add "comment" and "barnstar" headings to profile nav fixes publiclab#2165 * minor changes
* User must be logged out to access /login page * Update user_sessions_controller.rb
* Some modification to user dropdown menu on navbar * Added tests
* Replace blog link with stories from Read Stories button (Fixes issue publiclab#2454) * changed button content(issue#2454) * Update home.html.erb
Souravirus
force-pushed
the
rails_rebase
branch
from
f83747f to
5289923
Compare
|
Hey I did as you told by standing at |
Souravirus
force-pushed
the
rails_rebase
branch
from
63c62e8 to
5289923
Compare
|
Ah, i think this is good, so now this is where you can finish the 4.2 port, right? @Gauravano how does this look to you? |
|
Yeah @jywarren I will do rails 4.2 port on it. |
2 tasks
|
hi @jywarren @Souravirus , looks good to me |
|
Hey @jywarren, are we ready to merge this PR. So, that I can start updating to rails 4.2 for new commits. |
|
OK! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!
rake test:allPlease be sure you've reviewed our contribution guidelines at https://publiclab.org/wiki/contributing-to-public-lab-software
We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on [email protected] when your request is ready or if you need assistance.
Thanks!