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

List:       markus-dev
Subject:    [MarkUsProject/Markus] fb102f: Fix use of mocha gem
From:       GitHub <noreply () github ! com>
Date:       2013-03-08 4:33:10
Message-ID: 51396a06cafbf_1a421313138286c () hookshot-fe1-pe1-prd ! aws ! github ! net ! mail
[Download RAW message or body]

----==_mimepart_51396a06c47f2_1a421313138268a
Date: Thu, 07 Mar 2013 20:33:10 -0800
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <51396a06c7895_1a4213131382779@hookshot-fe1-pe1-prd.aws.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: fb102fa95d5f47d0332d6d76e9f6936a662acd5c
      https://github.com/MarkUsProject/Markus/commit/fb102fa95d5f47d0332d6d76e9f6936a662acd5c
  Author: Daniel St. Jules <danielst.jules@gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M Gemfile
    M Gemfile.lock
    M test/functional/annotation_categories_controller_test.rb
    M test/functional/assignments_controller_test.rb
    M test/functional/flexible_criteria_controller_test.rb
    M test/functional/graders_controller_test.rb
    M test/functional/groups_controller_csv_upload_test.rb
    M test/functional/groups_controller_test.rb
    M test/functional/results_controller_test.rb
    M test/functional/role_switching_test.rb
    M test/functional/rubrics_controller_test.rb
    M test/functional/submissions_controller_test.rb
    M test/test_helper.rb
    M test/unit/admin_test.rb
    M test/unit/grouping_test.rb
    M test/unit/helpers/ensure_config_helper_test.rb
    M test/unit/helpers/pagination_helper_test.rb
    M test/unit/markus_logger_test.rb
    M test/unit/rubric_criteria_test.rb
    M test/unit/student_test.rb
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Fix use of mocha gem


  Commit: 4dea4eb39ec6746a9761e3f320b94c71749c59a8
      https://github.com/MarkUsProject/Markus/commit/4dea4eb39ec6746a9761e3f320b94c71749c59a8
  Author: Karen Reid <reid@cs.toronto.edu>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M Gemfile
    M Gemfile.lock
    M test/functional/annotation_categories_controller_test.rb
    M test/functional/assignments_controller_test.rb
    M test/functional/flexible_criteria_controller_test.rb
    M test/functional/graders_controller_test.rb
    M test/functional/groups_controller_csv_upload_test.rb
    M test/functional/groups_controller_test.rb
    M test/functional/results_controller_test.rb
    M test/functional/role_switching_test.rb
    M test/functional/rubrics_controller_test.rb
    M test/functional/submissions_controller_test.rb
    M test/test_helper.rb
    M test/unit/admin_test.rb
    M test/unit/grouping_test.rb
    M test/unit/helpers/ensure_config_helper_test.rb
    M test/unit/helpers/pagination_helper_test.rb
    M test/unit/markus_logger_test.rb
    M test/unit/rubric_criteria_test.rb
    M test/unit/student_test.rb
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Merge pull request #1040 from danielstjules/issue-1039

Fix for issue-1039


Compare: https://github.com/MarkUsProject/Markus/compare/0d725d7048d5...4dea4eb39ec6

----==_mimepart_51396a06c47f2_1a421313138268a--
[prev in list] [next in list] [prev in thread] [next in thread]