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 sidekiq gem #2738

Merged
merged 7 commits into from
Jun 5, 2018
Merged

Add sidekiq gem #2738

merged 7 commits into from
Jun 5, 2018

Conversation

ViditChitkara
Copy link
Member

@ViditChitkara ViditChitkara commented May 21, 2018

part of #2104

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • 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
  • PR is descriptively titled
  • PR body includes fixes #0000-style reference to original issue #
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/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.

Thanks!

@ViditChitkara ViditChitkara added help wanted requires help by anyone willing to contribute summer-of-code review-me labels May 21, 2018
@ViditChitkara
Copy link
Member Author

@icarito @jywarren if we could start with this?

@PublicLabBot
Copy link

PublicLabBot commented May 21, 2018

2 Messages
📖 @ViditChitkara 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.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@jywarren
Copy link
Member

@icarito does this look good? Thanks Vidit!

@icarito
Copy link
Member

icarito commented May 22, 2018

Hi! Thanks for the pull request. I am not familiar with resque except from superficially reading the docs - from the changes it doesn't look like it needs anything, but won't we need a Redis service too?

What about whenever gem, doesn't it serve the same purpose? We recently merged a patch by @namangupta01 that adds it.

I think we should either use cron or Redis unless I'm missing something.

@icarito
Copy link
Member

icarito commented May 22, 2018

From https://stackoverflow.com/questions/285717/a-cron-job-for-rails-best-practices :

"(...) Keep in mind that Resque is a dead project (not actively maintained), so Sidekiq is a way better alternative. It also is more performant: Sidekiq runs several workers on a single, multithread process while Resque runs each worker in a separate process.

edited Sep 16 '15 at 18:23
answered Oct 24 '14 at 20:20 "

@jywarren you have a much deeper understanding of Gem ecosystem and plots2 in particular so those are just my comments as I try to keep us running only on actively maintained dependencies. Feel free to merge if you think it's fine!

@jywarren
Copy link
Member

jywarren commented May 22, 2018 via email

@ViditChitkara
Copy link
Member Author

Hi @icarito , Yes we need redis service too! Redis service is mandatory for resque. I think we need to manually install redis on our production servers. I also did manual installation of redis (it is a key-value based database) on my local environment for testing out resque. So, maybe some similar method must be there for redis installation on the server.
Whenever gem just executes the file or command specified in the scheduler.
So these are two things through which we could accomplish recurring mails:-

  1. Whenever gem - specifies just time and date on which the specified file runs
  2. Resque+redis - The file which runs are en-queued here and executed asynchronously.

@ViditChitkara
Copy link
Member Author

ViditChitkara commented May 23, 2018

Vidit, can you add some extra info to help guide the next step? Thanks!

Trying to dig out some resources. Will update here soon.

@jywarren
Copy link
Member

@ViditChitkara - I think @icarito is saying that resque is no longer actively supported and suggesting sidekiq as a possible alternative.

I'm seeing last update 2 days ago for https://github.com/mperham/sidekiq/pulse/monthly

17 days ago for resque: https://github.com/resque/resque/pulse/monthly

Since Redis says it's compatible with both, what do you think?

@jywarren
Copy link
Member

@icarito how shall we proceed on getting redis installed -- i believe you'd mentioned a container somewhere -- can we link that thread in here?

Let's really try using the unstable branch to try a lot of this before merging to master, ok?

@jywarren
Copy link
Member

@ViditChitkara if you can link us to the past conversation (try searching for it?) about containers and redis -- that'll help us plot out the next steps. Thanks!

@icarito
Copy link
Member

icarito commented May 24, 2018

The general idea is that we'll need to add Redis to docker-compose.yml file. We should get #2593 merged and then we can get working on adding Redis service to the appropriate docker-compose file on each instance.

@icarito
Copy link
Member

icarito commented May 24, 2018

If we can merge the Gem and then cofigure the link to a Redis service that'd be fine from my side. That way we can get this merged and make another PR with the required changes to the deployment process and container definitions.

@ViditChitkara
Copy link
Member Author

If we can merge the Gem and then cofigure the link to a Redis service that'd be fine from my side. That way we can get this merged and make another PR with the required changes to the deployment process and container definitions.

@icarito so should be currently stick to resque or should we use sidekiq??

@ViditChitkara
Copy link
Member Author

@icarito @jywarren I have added sidekiq gem. Please have a look!

@ViditChitkara ViditChitkara changed the title Add resque gem Add sidekiq gem May 26, 2018
@namangupta01 namangupta01 requested review from namangupta01 and removed request for namangupta01 May 26, 2018 18:45
@namangupta01
Copy link
Member

@ViditChitkara There is code climate error, please fix it. Then it will be good to go.

@icarito
Copy link
Member

icarito commented May 27, 2018

@ViditChitkara I think it would be great if you could work on adding a Redis container to docker-compose.yml. Please look at this SO question for guidance: https://stackoverflow.com/questions/42376867/how-to-connect-to-a-redis-container-using-docker-compose . If sidekiq doesn't break without a Redis service then we can make it a different pull request and merge this first. But if this needs Redis to work at all then we'll need to define a Redis service in docker-compose based on the Redis image from the Docker hub, much like we do with MySQL. Also we'll need to make sure that the configuration to locate the Redis service is done by environment variables.

@icarito
Copy link
Member

icarito commented May 27, 2018

Also see how we currently configure the MySQL container reading the docker-compose.yml file.

@icarito
Copy link
Member

icarito commented May 27, 2018

The redis container image to be integrated is https://hub.docker.com/_/redis/

@ViditChitkara
Copy link
Member Author

Thanks for your guidance @icarito . I did some research regarding docker and docker-compose and made some changes. However, travis tests are failing, could you please have a look, where it went wrong?
Thanks!!

@namangupta01
Copy link
Member

@ViditChitkara Same error is happening in #2669. I think there is some problem in the master itself.

@ViditChitkara
Copy link
Member Author

The conflicts are resolved!! Thanks for the help @jywarren .

@ViditChitkara
Copy link
Member Author

Please have a look at the redis container code in docker-compose file. If that's good to go, we could merge this.

@jywarren
Copy link
Member

jywarren commented Jun 3, 2018

Great -- if @icarito gives us a green light on the redis setup, we can merge! @icarito go ahead if this looks ready!

@icarito
Copy link
Member

icarito commented Jun 5, 2018

Hi @ViditChitkara and @jywarren - The docker-compose.yml file is wrong because only one new container is needed (redis) - Vidit added another container called sidekiq which is not needed at all. Please remove this extra container.

@icarito
Copy link
Member

icarito commented Jun 5, 2018

I mean this comment: https://github.com/publiclab/plots2/pull/2738/files#diff-4e5e90c6228fd48698d074241c2ba760R32 - the environment variable defined there must go into the web container instead.

@ViditChitkara
Copy link
Member Author

Hi @icarito, redis alone won't help, we need to start sidekiq (bundle exec sidekiq) and maybe that's why we need to create an extra container for this. Saw various examples, have a look at:-
https://stackoverflow.com/questions/33563161/how-to-put-sidekiq-into-docker-in-a-rails-application

@ViditChitkara
Copy link
Member Author

Also, do I need to shift the env variable to web container, I mean append to that environment list??

@icarito
Copy link
Member

icarito commented Jun 5, 2018

Oh sorry then @ViditChitkara I misunderstood. I thought we needed one scheduler but it seems we need an extra process to schedule the scheduler? @jywarren this feels like an overly complex setup for scheduling but I guess it's common practice - I'm fine with merging in that case.

@ViditChitkara
Copy link
Member Author

Cool, let's see how this works after merging, I guess it's good to go then!! @icarito, @jywarren.

@jywarren jywarren merged commit 539229b into publiclab:master Jun 5, 2018
@ghost ghost removed the ready label Jun 5, 2018
@jywarren
Copy link
Member

jywarren commented Jun 5, 2018

Awesome, merged! How will we confirm it works?

Thanks all!

@ViditChitkara
Copy link
Member Author

Don't really know how to check if it is running on production. However I will create a route to mount sidekiq server where we could view all the queues and workers on a separate portal.

@icarito
Copy link
Member

icarito commented Jun 6, 2018

Vidit, congratulations on a milestone that we do need ! :-) 🥇
I was just now reading up on GitLab and found a note that there is a possibility to leak memory with Sidekiq but according to its developers it depends a lot on how we use it.

@jywarren do please review that last link I just shared because it lists some Gems that we do use as potentially problematic: RMagick, libxml-ruby and therubyracer sound familiar from our Gemfile.

If memory consumption grows, stability and performance can suffer so let's keep this in mind please! Thanks!

@jywarren
Copy link
Member

jywarren commented Jun 6, 2018

We definitely use therubyracer. I think this probably merits its own issue, esp since this is closed now. @ViditChitkara can you open one?

Is this an absolute requirement not to use therubyracer and rmagick? Or just not in conjunction with sidekiq? Let's make a checklist of items we need to replace.

What will happen if we are running production code without these gems removed? We'll see instability once memory runs out?

@jywarren
Copy link
Member

jywarren commented Jun 6, 2018

If you can copy in this info:

sstephenson/execjs#205 (comment) says therubyracer can be a problem with sidekiq -- but execjs can be run with nodejs instead. That seems like a way forward. I'm not sure what's relying on therubyracer here, actually - it's been in the repo a long time!

@jywarren
Copy link
Member

jywarren commented Jun 6, 2018

It does look like execjs and therubyracer are only used to compile assets? https://github.com/publiclab/plots2/blob/master/Gemfile#L44

@jywarren
Copy link
Member

jywarren commented Jun 6, 2018

RMagick isn't installed -- paperclip just uses imageMagick directly outside Ruby. (we do use it in MapKnitter!)

@jywarren
Copy link
Member

jywarren commented Jun 6, 2018

and libxml-ruby also not in Gemfile. Maybe we're ok?

SidharthBansal pushed a commit to SidharthBansal/plots2 that referenced this pull request Jun 19, 2018
* added resque gem

* made changes for resqu installation

* added sidekiq gem

* minor changes

* modified docker-compose.yml for redis

* minor changes

* resolve conflicts
jywarren pushed a commit that referenced this pull request Jun 20, 2018
* Routes modified

* Set the views

* Modified error messages and user_tag

* Add User_Tag as identity and find user_tag

* User_sessions_controller modified

* User_tag modified

* user session controller modified

* Checkpoint 1

*  checkpoint1 codeclimate errors fixed

* Checkpoint 2

* checkpoint 2

* User is created from sign up process successfully

* create a usertag_with_omniauth

* Search a usertag for oauth

* search user_tag existing in db

* create a user with omniauth test

* LOGIN WORKS

* current_user=(user) method removed

* sign up correction

* routing tests for google oauth

* Google auth details saved

* Google should return omniauth hash test

* sign up and login via provider

* sign up and login via provider alternative flow

* flash message test added

* login user with an email and then connect google provider

* .

* Changes according to rails 5 done

* Changes according to rails 5 done

* Environment nomenclature updated

* Comments added

* Adding application.yml

* Submitting a draft  (#2747)

* Checkbox and JS function added

* publish_draft method, routes, mail_notify_stop

* coauthor can see and publish

* bower update

* undo and trying

* draft label on dashboard

* draft option not visible to first timer

* updating bower

* debug1

* removing debug statement

* button view

* view 2

* normal

* generate path added

* publish privil update

* code climate

* displaying comment with status1 only

* coauthor can view draft

* test correction

* button text change to save if draft

* fixture addition and 1 test

* tests , fixtures and minor changes

* test addition

* codeclimate 1

* codeclimate 2

* codeclimate 3

* minor fixes

* enable method=post for data-url image upload at /post (#2675)

* enable method=post for data-url image upload at /post

* Update editor_controller.rb

* Update editor_controller.rb

* Fixed first part of Issue #2352 Sorting headers added in wiki index page (#2353)

* sorting headers added in wiki index page

* replaced sorting header icon

* Improved translate widget (#2553)

* enhanced translate widget

* changed title formatting of widget

* Fix the clone command (#2766)

* List subscription change (#2767)

* Add sidekiq gem (#2738)

* added resque gem

* made changes for resqu installation

* added sidekiq gem

* minor changes

* modified docker-compose.yml for redis

* minor changes

* resolve conflicts

* Place tag detection and replacing "-" with "" (#2734)

* Place tag detection and replacing "-" with ""

* Javascript changed

* Geocode method added

* Tweaks

* Tweaks

* Tweaks

* Tweaks 2

* Tweaks 3

* Update Gemfile.lock

* Climate fix

* add geocoded tags

* Tweaks

* Block shift and callback to onComplete

* onComplete binded with ajax

* place in starting of tag detection

* Tweaks

* make descriptive tag links move to bottom of page (#2770)

* skylight config (#2773)

* Reply to comment by email feature (#2669)

* Added mailman script

* Added migration file for adding comment_via column to comment table

* Added reverse_markdown gem for converting html to markdown format

* Added migration file for adding message_id column to comment table

* Added function to handle received mail to create comment

* Added icon for comment added via email to distinguish between the normal comment and reply by email comment

* Added node_id in Mailer subjects to be used in reply by email feature

* Minor changes

* Updated schema.rb.example file

* Improved tests

* Added migrations

* Added migrations

* Added migrations

* Corrected tests

* Added enviroment variable for server address

* Added sql sphefic conditions

* Unwanted changes in schema.rb.example file is removed

* Gem added

* Log file is moved to public folder

* Corrected tests

* forward-date timestamps

* Rename 20180605190014_add_message_id_column_to_comments.rb to 20180605010014_add_message_id_column_to_comments.rb

* Update schema.rb.example

* Added whenever cron update command in Makefile for redeploy-container (#2780)

* Fix rss images and email images (#2784)

* Fix rss images and email images

* Update rss.rss.builder

* Update rss_for_tagged_with_author.rss.builder

* Update rss.rss.builder

* Update rss.rss.builder

* Update notify_node_creation.html.erb

* Rails 5.0 upgrade (#2726) (#2783)

* Rails 5.0 upgrade (#2726)

* Upgraded the .gitignore according to rails diff

* Initial Gemfile update

* Update README.md

* Showing message at the top of upgrade page (#2713)

* added an upgrade alert tag

* Additional questions page tweak (#2721)

* added the tag to determine which upgrade is listed on the website

* changed regex back

* added an upgrade alert tag

* added the tag to determine which upgrade is listed on the website

* changed regex back

* added upgrade after pull and rebase master

* Upgrade to Rails 5

* Uncommented composite_primary_key gem

* Removed the dual occurence of rails_autolink

* Update readme installation, fixes #2729 (#2730)

Updates the readme to change the installation instructions, fixes #2729

* Commented activerecord-tableless

* Draft display on Dashboard (#2666)

* draft display on dashboard

* moderator file view permitted

* checking

* fix

* test fix

* Added and modified few config files according to railsdiff.org

* Removed mass_assignment_sanitizer

* Removed composite primary key gem

* Removed all attr_accessible in all models

* Added composite_primary_key gem again

* Downgraded rails and removed few attr_accessible commands

* Added strong parameters to the controllers

* Added strong parameters gem and also include params.require inside private methods

* Added strongparameters.rb file to initializers folder

* Removed unnecessary strong_parameter functions

* Removed some errors

* Changed test command temporarily in .travis.yml

* Corrected config/puma.rb file with adding some assets

* Added all the config.precompile files in one line

* Removed error of problem in updating of user profile

* Removed the error while creating a user

* Removed error RecordNotFound: Couldn't find Node with 'nid'=

* Removed some errors related to ids

* Removed comment.reload in comment_controller_test

* Track Dockerfiles accross instances. (#2593)

* Track Dockerfiles accross instances.

* Specify jessie as base

* Add commands to build&deploy container with Makefile. (#2746)

* Added Sample Cron Job to check working of Whenever Gem (#2715)

*  Added Sample Cron Job to test Whenever Gem

* Added make targets for deployment and cron service start

* Added make to image

* Tweak Makefile

* Fix cron starting command in Makefile

* Trim whitespace

* Explicitly set jessie as base container

* Fixed codeclimate issues

* Auto-set wiki slug (#2743)

* Added keyword arguments to the tag_model.rb

* changed the query statement in search method of node.rb

* Force removal of pid file (see
docker/compose#1393)

* Updated the tests due to change in arguments of search function in node.rb

* Removed all the failures from tag_controller_test.rb

* Changed the style of params in notes_controller_test.rb

* Removed all depreciation warnings related to notes_controller

* Removed all deprecation warnings related to image_controller and answers_controller

* Removed all deprecation warnings of like_controller and fixed syntax error of answer_controller_test.rb

* Removed all dep warnings of editor_controller and syntax error of like_controller_test.rb

* removed all errors of answer_controller and some errors of tag_controller.rb

* Removed all dep warnings of tag_controller_test.rb

* Removed several dep warnings

* Removed dep warnings of wiki_controller

* Removed dep warnings of talk_controller

* Removed dep warnings of legacy_controller_test.rb

* Removed some warnings related to comment_controller

* Removed the syntax errors

* Removed two failures regarding application/xml+rss

* Removed 2 failures due to wrong way of passing parameters in tests

* Removed 2 failures

* Fix params

* Remove deprecations

* Removed some dep warnings

* Remove deprecations

* Reverted to nothing => true

* Reverted to nothing => true

* Avoid rendering more than once in the same action

* Removed all dep warnings related to user_tags_controller_test

* Remove deprecation

* Removed Dep warnings

* Fix deprecation

* Replace before_filter

* Remove deprecation

* Remove deprecation

* Remove deprecation

* Remove deprecation

* Bump Ruby version to match Travis'

* Simplify email regex to work with Ruby 2.4.1

* Changed the ruby version in Dockerfile

* Remove deprecation

* Remove deprecation

* Removed the depreciation warning related to dynamic :controller and :action segment in routes

* Changed the default ActiveRecord to ApplicationRecord in models

* Clean Gemfile

* Reverted to ['nid'] in tag_controller_test.rb

* Changed the tests to rake test:all in .travis.yml

* Minor spacing correction in .travis.yml

* added a commit in application.js an application.css regarding the precompilation of files

* Added more indentation

* Small fixes

* Separated the rails test and jasmine and coveralls task

* Modified ['nid'] to ['node']['nid']

* Removed the extra puts in Rakefile

* Changed the serial of tests

* Added rake/testtask to Rakefile

* Removed puma

* Changed to ruby 2.4.1-jessie

* Removed the whitelist_attributes command from config/application.rb

* Removed two failures due to old usage of params

* Fixed some new deprecation warnigs introduced

* fixes #2731 'add spam button,line 16 _answers.html.erb' (#2785)

* add spam button,line 16 _answers.html.erb

* changed comment.ids to answer.ids

* changed from comment path to answer

* changed comment.parent.path to answer.path

* some more cleanup to the button

* change answer.aid to answer id

* First timers recaptcha Environment Variables (#2786)

* Edited the if statement

* Added the env variables

* Edited ENV variable, and added fallback

* Fixed issue#2445 added both direction sort order (#2557)

* fixed issue#2445 added both direction sort order

* added function get_order_string in tags_controller

* Changed get to post (#2788)

* Update container definitions to match actual files used. (#2791)

* Update container definitions to match actual files used.

* Fix paths for running docker-compose.yml from subdir

* Fix reference to Dockerfile

* Reformat range stats page to table (#2792)

* Index page listing for UserTags per issue #2741. (#2753)

* Index page listing for UserTags per issue #2741.

* Changes per pull request checks.

* Removed debugging line.

* Added routes to reflect 'groups' naming convention for user_tags per pull request spec.

* Tests rewritten after rebase.

* Index page listing for UserTags per issue #2741.

* Changes per pull request checks.

* Removed debugging line.

* Added routes to reflect 'groups' naming convention for user_tags per pull request spec.

* Fix for test of sort by value.

* Update routes.rb for wiki update (#2804)

* Update routes.rb

* fixes

* integration tests for assets (#2806)

* integration tests for assets

* full assets included

* Update assets.rb

* Added routes to notes/edit (#2808)

* Added routes to notes/edit

* Removed redundant notes#edit and added get instead of post in edit actions

* Update routes.rb (#2810)

* Create OPENID.md

* fixing error in home_controller related to `group by` (#2794)

* Added group by note.nid

* correction

* Openid fix with post route and better alert texts (#2815)

* Added group by note.nid

* correction

* reworded openid requests and added post method for 2nd step

* adjust message

* Update openid_test.rb

* Update openid_test.rb

* Update openid_test.rb

* Update openid_test.rb

* Update Dangerfile (#2816)

* Update routes.rb to fix embeddable features (#2818)

* Update routes.rb

* Removed the apostrophe mismatch

* Added tests for embed in feature

* Delete route for notes (#2820)

* Documentation for the reply-by-email to comment feature (#2774)

* Added documentation for the reply-by-email to comment feature

* Added documentation for the reply-by-email to comment feature

* Added documentation for the reply-by-email to comment feature

* Added documentation for the reply-by-email to comment feature

* Re-order comment options and messages (#2834)

* Update _comment.html.erb

* Update _comment.html.erb

* encoding issue resolved for migrating DrupalUsers to User records (#2257)

* encoding issue solved

fixes #2209

* minor changes

* Rename 20180206161706_add_user_for_orphaned_drupal_user.rb to 20180614000000_add_user_for_orphaned_drupal_user.rb

* resolves issue 2520 (#2831)

* Emoji autocomplete (#2832)

* basic emoji autocomplete

* minor changes

* minor tweaks

* code climate fixes

* minor change

* changes

* remove unnecessary style

* Fix parent powertags for wikis like /barnraising (#2844)

* application.yml added

* Views removed

* Application.yml removed

* application removed

* Docker changes

* sign up page removed
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* added resque gem

* made changes for resqu installation

* added sidekiq gem

* minor changes

* modified docker-compose.yml for redis

* minor changes

* resolve conflicts
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* Routes modified

* Set the views

* Modified error messages and user_tag

* Add User_Tag as identity and find user_tag

* User_sessions_controller modified

* User_tag modified

* user session controller modified

* Checkpoint 1

*  checkpoint1 codeclimate errors fixed

* Checkpoint 2

* checkpoint 2

* User is created from sign up process successfully

* create a usertag_with_omniauth

* Search a usertag for oauth

* search user_tag existing in db

* create a user with omniauth test

* LOGIN WORKS

* current_user=(user) method removed

* sign up correction

* routing tests for google oauth

* Google auth details saved

* Google should return omniauth hash test

* sign up and login via provider

* sign up and login via provider alternative flow

* flash message test added

* login user with an email and then connect google provider

* .

* Changes according to rails 5 done

* Changes according to rails 5 done

* Environment nomenclature updated

* Comments added

* Adding application.yml

* Submitting a draft  (publiclab#2747)

* Checkbox and JS function added

* publish_draft method, routes, mail_notify_stop

* coauthor can see and publish

* bower update

* undo and trying

* draft label on dashboard

* draft option not visible to first timer

* updating bower

* debug1

* removing debug statement

* button view

* view 2

* normal

* generate path added

* publish privil update

* code climate

* displaying comment with status1 only

* coauthor can view draft

* test correction

* button text change to save if draft

* fixture addition and 1 test

* tests , fixtures and minor changes

* test addition

* codeclimate 1

* codeclimate 2

* codeclimate 3

* minor fixes

* enable method=post for data-url image upload at /post (publiclab#2675)

* enable method=post for data-url image upload at /post

* Update editor_controller.rb

* Update editor_controller.rb

* Fixed first part of Issue publiclab#2352 Sorting headers added in wiki index page (publiclab#2353)

* sorting headers added in wiki index page

* replaced sorting header icon

* Improved translate widget (publiclab#2553)

* enhanced translate widget

* changed title formatting of widget

* Fix the clone command (publiclab#2766)

* List subscription change (publiclab#2767)

* Add sidekiq gem (publiclab#2738)

* added resque gem

* made changes for resqu installation

* added sidekiq gem

* minor changes

* modified docker-compose.yml for redis

* minor changes

* resolve conflicts

* Place tag detection and replacing "-" with "" (publiclab#2734)

* Place tag detection and replacing "-" with ""

* Javascript changed

* Geocode method added

* Tweaks

* Tweaks

* Tweaks

* Tweaks 2

* Tweaks 3

* Update Gemfile.lock

* Climate fix

* add geocoded tags

* Tweaks

* Block shift and callback to onComplete

* onComplete binded with ajax

* place in starting of tag detection

* Tweaks

* make descriptive tag links move to bottom of page (publiclab#2770)

* skylight config (publiclab#2773)

* Reply to comment by email feature (publiclab#2669)

* Added mailman script

* Added migration file for adding comment_via column to comment table

* Added reverse_markdown gem for converting html to markdown format

* Added migration file for adding message_id column to comment table

* Added function to handle received mail to create comment

* Added icon for comment added via email to distinguish between the normal comment and reply by email comment

* Added node_id in Mailer subjects to be used in reply by email feature

* Minor changes

* Updated schema.rb.example file

* Improved tests

* Added migrations

* Added migrations

* Added migrations

* Corrected tests

* Added enviroment variable for server address

* Added sql sphefic conditions

* Unwanted changes in schema.rb.example file is removed

* Gem added

* Log file is moved to public folder

* Corrected tests

* forward-date timestamps

* Rename 20180605190014_add_message_id_column_to_comments.rb to 20180605010014_add_message_id_column_to_comments.rb

* Update schema.rb.example

* Added whenever cron update command in Makefile for redeploy-container (publiclab#2780)

* Fix rss images and email images (publiclab#2784)

* Fix rss images and email images

* Update rss.rss.builder

* Update rss_for_tagged_with_author.rss.builder

* Update rss.rss.builder

* Update rss.rss.builder

* Update notify_node_creation.html.erb

* Rails 5.0 upgrade (publiclab#2726) (publiclab#2783)

* Rails 5.0 upgrade (publiclab#2726)

* Upgraded the .gitignore according to rails diff

* Initial Gemfile update

* Update README.md

* Showing message at the top of upgrade page (publiclab#2713)

* added an upgrade alert tag

* Additional questions page tweak (publiclab#2721)

* added the tag to determine which upgrade is listed on the website

* changed regex back

* added an upgrade alert tag

* added the tag to determine which upgrade is listed on the website

* changed regex back

* added upgrade after pull and rebase master

* Upgrade to Rails 5

* Uncommented composite_primary_key gem

* Removed the dual occurence of rails_autolink

* Update readme installation, fixes publiclab#2729 (publiclab#2730)

Updates the readme to change the installation instructions, fixes publiclab#2729

* Commented activerecord-tableless

* Draft display on Dashboard (publiclab#2666)

* draft display on dashboard

* moderator file view permitted

* checking

* fix

* test fix

* Added and modified few config files according to railsdiff.org

* Removed mass_assignment_sanitizer

* Removed composite primary key gem

* Removed all attr_accessible in all models

* Added composite_primary_key gem again

* Downgraded rails and removed few attr_accessible commands

* Added strong parameters to the controllers

* Added strong parameters gem and also include params.require inside private methods

* Added strongparameters.rb file to initializers folder

* Removed unnecessary strong_parameter functions

* Removed some errors

* Changed test command temporarily in .travis.yml

* Corrected config/puma.rb file with adding some assets

* Added all the config.precompile files in one line

* Removed error of problem in updating of user profile

* Removed the error while creating a user

* Removed error RecordNotFound: Couldn't find Node with 'nid'=

* Removed some errors related to ids

* Removed comment.reload in comment_controller_test

* Track Dockerfiles accross instances. (publiclab#2593)

* Track Dockerfiles accross instances.

* Specify jessie as base

* Add commands to build&deploy container with Makefile. (publiclab#2746)

* Added Sample Cron Job to check working of Whenever Gem (publiclab#2715)

*  Added Sample Cron Job to test Whenever Gem

* Added make targets for deployment and cron service start

* Added make to image

* Tweak Makefile

* Fix cron starting command in Makefile

* Trim whitespace

* Explicitly set jessie as base container

* Fixed codeclimate issues

* Auto-set wiki slug (publiclab#2743)

* Added keyword arguments to the tag_model.rb

* changed the query statement in search method of node.rb

* Force removal of pid file (see
docker/compose#1393)

* Updated the tests due to change in arguments of search function in node.rb

* Removed all the failures from tag_controller_test.rb

* Changed the style of params in notes_controller_test.rb

* Removed all depreciation warnings related to notes_controller

* Removed all deprecation warnings related to image_controller and answers_controller

* Removed all deprecation warnings of like_controller and fixed syntax error of answer_controller_test.rb

* Removed all dep warnings of editor_controller and syntax error of like_controller_test.rb

* removed all errors of answer_controller and some errors of tag_controller.rb

* Removed all dep warnings of tag_controller_test.rb

* Removed several dep warnings

* Removed dep warnings of wiki_controller

* Removed dep warnings of talk_controller

* Removed dep warnings of legacy_controller_test.rb

* Removed some warnings related to comment_controller

* Removed the syntax errors

* Removed two failures regarding application/xml+rss

* Removed 2 failures due to wrong way of passing parameters in tests

* Removed 2 failures

* Fix params

* Remove deprecations

* Removed some dep warnings

* Remove deprecations

* Reverted to nothing => true

* Reverted to nothing => true

* Avoid rendering more than once in the same action

* Removed all dep warnings related to user_tags_controller_test

* Remove deprecation

* Removed Dep warnings

* Fix deprecation

* Replace before_filter

* Remove deprecation

* Remove deprecation

* Remove deprecation

* Remove deprecation

* Bump Ruby version to match Travis'

* Simplify email regex to work with Ruby 2.4.1

* Changed the ruby version in Dockerfile

* Remove deprecation

* Remove deprecation

* Removed the depreciation warning related to dynamic :controller and :action segment in routes

* Changed the default ActiveRecord to ApplicationRecord in models

* Clean Gemfile

* Reverted to ['nid'] in tag_controller_test.rb

* Changed the tests to rake test:all in .travis.yml

* Minor spacing correction in .travis.yml

* added a commit in application.js an application.css regarding the precompilation of files

* Added more indentation

* Small fixes

* Separated the rails test and jasmine and coveralls task

* Modified ['nid'] to ['node']['nid']

* Removed the extra puts in Rakefile

* Changed the serial of tests

* Added rake/testtask to Rakefile

* Removed puma

* Changed to ruby 2.4.1-jessie

* Removed the whitelist_attributes command from config/application.rb

* Removed two failures due to old usage of params

* Fixed some new deprecation warnigs introduced

* fixes publiclab#2731 'add spam button,line 16 _answers.html.erb' (publiclab#2785)

* add spam button,line 16 _answers.html.erb

* changed comment.ids to answer.ids

* changed from comment path to answer

* changed comment.parent.path to answer.path

* some more cleanup to the button

* change answer.aid to answer id

* First timers recaptcha Environment Variables (publiclab#2786)

* Edited the if statement

* Added the env variables

* Edited ENV variable, and added fallback

* Fixed issue#2445 added both direction sort order (publiclab#2557)

* fixed issue#2445 added both direction sort order

* added function get_order_string in tags_controller

* Changed get to post (publiclab#2788)

* Update container definitions to match actual files used. (publiclab#2791)

* Update container definitions to match actual files used.

* Fix paths for running docker-compose.yml from subdir

* Fix reference to Dockerfile

* Reformat range stats page to table (publiclab#2792)

* Index page listing for UserTags per issue publiclab#2741. (publiclab#2753)

* Index page listing for UserTags per issue publiclab#2741.

* Changes per pull request checks.

* Removed debugging line.

* Added routes to reflect 'groups' naming convention for user_tags per pull request spec.

* Tests rewritten after rebase.

* Index page listing for UserTags per issue publiclab#2741.

* Changes per pull request checks.

* Removed debugging line.

* Added routes to reflect 'groups' naming convention for user_tags per pull request spec.

* Fix for test of sort by value.

* Update routes.rb for wiki update (publiclab#2804)

* Update routes.rb

* fixes

* integration tests for assets (publiclab#2806)

* integration tests for assets

* full assets included

* Update assets.rb

* Added routes to notes/edit (publiclab#2808)

* Added routes to notes/edit

* Removed redundant notes#edit and added get instead of post in edit actions

* Update routes.rb (publiclab#2810)

* Create OPENID.md

* fixing error in home_controller related to `group by` (publiclab#2794)

* Added group by note.nid

* correction

* Openid fix with post route and better alert texts (publiclab#2815)

* Added group by note.nid

* correction

* reworded openid requests and added post method for 2nd step

* adjust message

* Update openid_test.rb

* Update openid_test.rb

* Update openid_test.rb

* Update openid_test.rb

* Update Dangerfile (publiclab#2816)

* Update routes.rb to fix embeddable features (publiclab#2818)

* Update routes.rb

* Removed the apostrophe mismatch

* Added tests for embed in feature

* Delete route for notes (publiclab#2820)

* Documentation for the reply-by-email to comment feature (publiclab#2774)

* Added documentation for the reply-by-email to comment feature

* Added documentation for the reply-by-email to comment feature

* Added documentation for the reply-by-email to comment feature

* Added documentation for the reply-by-email to comment feature

* Re-order comment options and messages (publiclab#2834)

* Update _comment.html.erb

* Update _comment.html.erb

* encoding issue resolved for migrating DrupalUsers to User records (publiclab#2257)

* encoding issue solved

fixes publiclab#2209

* minor changes

* Rename 20180206161706_add_user_for_orphaned_drupal_user.rb to 20180614000000_add_user_for_orphaned_drupal_user.rb

* resolves issue 2520 (publiclab#2831)

* Emoji autocomplete (publiclab#2832)

* basic emoji autocomplete

* minor changes

* minor tweaks

* code climate fixes

* minor change

* changes

* remove unnecessary style

* Fix parent powertags for wikis like /barnraising (publiclab#2844)

* application.yml added

* Views removed

* Application.yml removed

* application removed

* Docker changes

* sign up page removed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants