[prev in list] [next in list] [prev in thread] [next in thread] 

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 642e27: Issue #1985 fix test
From:       GitHub <noreply () github ! com>
Date:       2015-01-17 18:24:41
Message-ID: 54baa8e930f54_57c03fb3bed2d2bc55724 () hookshot-fe3-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 642e2714f77fb2e14bff72a92f5ad9bbf4324c0b
      https://github.com/MarkUsProject/Markus/commit/642e2714f77fb2e14bff72a92f5ad9bbf4324c0b
  Author: Peter Zhao <peterzhao333@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Issue #1985 fix test


  Commit: cce77d97beb7fda7db3ead214125f62c577d7ef5
      https://github.com/MarkUsProject/Markus/commit/cce77d97beb7fda7db3ead214125f62c577d7ef5
  Author: Peter Zhao <peterzhao333@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Issue #1985 fix test - remove puts


  Commit: 581489abd88d5dfb0879094b0767508a02b281c2
      https://github.com/MarkUsProject/Markus/commit/581489abd88d5dfb0879094b0767508a02b281c2
  Author: Peter Zhao <peterzhao333@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M app/models/grouping_queue.rb
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Fixed Issue #1985 - Corrected Submission Collector test


  Commit: 8bc4a6c1c675cf2178f0af7a3c8ce5eed0bb940d
      https://github.com/MarkUsProject/Markus/commit/8bc4a6c1c675cf2178f0af7a3c8ce5eed0bb940d
  Author: Peter Zhao <peterzhao333@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M app/controllers/results_controller.rb
    M app/helpers/submissions_helper.rb
    M app/models/result.rb
    M app/views/assignments/_form.html.erb
    M app/views/flexible_criteria/index.html.erb
    M app/views/grade_entry_forms/_form.html.erb
    M app/views/results/marker/show_result_error.js.erb
    M config/locales/en.yml
    M config/locales/fr.yml
    M config/locales/pt.yml

  Log Message:
  -----------
  Merge branch 'master' into issue-1985


  Commit: d719a542a191f7e5c1ab4950083ea96e580231cf
      https://github.com/MarkUsProject/Markus/commit/d719a542a191f7e5c1ab4950083ea96e580231cf
  Author: Peter Zhao <peterzhao333@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Cleaned up the code


  Commit: 8f500c6c69786628d5f85ade7b70b77c26237966
      https://github.com/MarkUsProject/Markus/commit/8f500c6c69786628d5f85ade7b70b77c26237966
  Author: Peter Zhao <peterzhao333@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Removed trailing whitespace


  Commit: 42adbc83232e831c5a8fd3cb22af80259d9108a1
      https://github.com/MarkUsProject/Markus/commit/42adbc83232e831c5a8fd3cb22af80259d9108a1
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M app/models/grouping_queue.rb
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Merge pull request #1993 from peterzhao333/issue-1985

Attempting Fix Issue #1985 - Don't merge - Currently testing with Travis


Compare: https://github.com/MarkUsProject/Markus/compare/3ab0f2d6aebc...42adbc83232e

_______________________________________________
Markus-dev mailing list
Markus-dev@markusproject.org
http://markusproject.org/cgi-bin/mailman/listinfo/markus-dev


[prev in list] [next in list] [prev in thread] [next in thread]