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
Make submission collection a background task #2563
Merged
david-yz-liu
merged 157 commits into
MarkUsProject:master
from
david-yz-liu:collection-job
May 28, 2016
Merged
Make submission collection a background task #2563
david-yz-liu
merged 157 commits into
MarkUsProject:master
from
david-yz-liu:collection-job
May 28, 2016
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
…making new annotations in controller
…ction-job Conflicts: app/controllers/submissions_controller.rb app/models/job_messenger.rb app/models/submission_collector.rb app/views/job_messages/_job_poller.js.erb app/views/submissions/browse.html.erb config/locales/en.yml config/routes.rb
…ction-job Conflicts: app/controllers/submissions_controller.rb app/jobs/submissions_job.rb app/views/job_messages/_job_poller.js.erb app/views/submissions/_submissions_table.js.jsx.erb app/views/submissions/browse.html.erb
…is alphabetical on the file name.
Fixing the sorting on the tables that contain files, so that sorting …
* Update schema.rb and Gemfile.lock * Add "BUNDLED WITH" to Gemfile.lock as per the upstream suggested workflow
Update outdated db migrations and gems + gitignore files from automated tests
m_logger.log("Now collecting: #{assignment.short_identifier} for grouping: " + | ||
"#{grouping.id}") | ||
|
||
if options[:revision_number].nil? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably should fix indentation throughout this method.
Changed test for ta names
Peer review upgrade
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.
Work of @RFrailich.