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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 2f3deb: Revert "Moved some git specific logic out of contr...
From:       GitHub <noreply () github ! com>
Date:       2014-12-12 20:13:32
Message-ID: 548b4c6c31445_64183fa197b192c046973 () hookshot-fe1-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/git
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 2f3deb8d6c6211acf97ed0865328d4fd47ba1de7
      https://github.com/MarkUsProject/Markus/commit/2f3deb8d6c6211acf97ed0865328d4fd47ba1de7
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M app/controllers/submissions_controller.rb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Revert "Moved some git specific logic out of controller"

This reverts commit d317ab3e5f8d88a3e80d7f7075403b7df926309d.

Conflicts:
	app/controllers/submissions_controller.rb


  Commit: 3cf11a8850a729690d7638722efa922fcc852310
      https://github.com/MarkUsProject/Markus/commit/3cf11a8850a729690d7638722efa922fcc852310
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M app/models/submission.rb

  Log Message:
  -----------
  Reverted commit which edited path in a model


  Commit: a46bdcbb26a4b66f77ed249735abdb57780eb7a9
      https://github.com/MarkUsProject/Markus/commit/a46bdcbb26a4b66f77ed249735abdb57780eb7a9
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    M app/controllers/results_controller.rb
    M app/controllers/submissions_controller.rb
    M app/views/submissions/repo_browser.html.erb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Solved path issues, stringify method rewrote.


  Commit: 6083071980b3427f84602566732b9186388275fc
      https://github.com/MarkUsProject/Markus/commit/6083071980b3427f84602566732b9186388275fc
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    A .travis.yml
    M app/controllers/results_controller.rb
    M app/controllers/submissions_controller.rb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Hound fixes + added .travis.yml config from Master


  Commit: 1ceeb2a45d933960493fa171ca6a734b8987c5c5
      https://github.com/MarkUsProject/Markus/commit/1ceeb2a45d933960493fa171ca6a734b8987c5c5
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    M app/controllers/submissions_controller.rb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Hound


  Commit: 1257d7a99de67cc8c51fef14a53034097f7da208
      https://github.com/MarkUsProject/Markus/commit/1257d7a99de67cc8c51fef14a53034097f7da208
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    A config/database.yml.ci

  Log Message:
  -----------
  Travis Database Config


  Commit: 0d092d3c3dca6d17ef2565d93eb5cd9cb2248fc9
      https://github.com/MarkUsProject/Markus/commit/0d092d3c3dca6d17ef2565d93eb5cd9cb2248fc9
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    M app/views/submissions/repo_browser.html.erb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Formatting, and included directory_selector fix


  Commit: 0da6124b404836bae6182e02e4294ad0227cdf05
      https://github.com/MarkUsProject/Markus/commit/0da6124b404836bae6182e02e4294ad0227cdf05
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    A config/database.yml.ci

  Log Message:
  -----------
  Merge branch 'git' of github.com:SoftwareDev/Markus into git


  Commit: d4e6ca1a4993cfadfd7db01f28f3a344a8eb18cf
      https://github.com/MarkUsProject/Markus/commit/d4e6ca1a4993cfadfd7db01f28f3a344a8eb18cf
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2014-12-06 (Sat, 06 Dec 2014)

  Changed paths:
    M app/views/submissions/repo_browser.html.erb

  Log Message:
  -----------
  Fixing indentation


  Commit: 4661e019f687d9fbf936e101c3cd23c0472d6627
      https://github.com/MarkUsProject/Markus/commit/4661e019f687d9fbf936e101c3cd23c0472d6627
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    A .travis.yml
    M app/controllers/submissions_controller.rb
    M app/models/submission.rb
    M app/views/submissions/repo_browser.html.erb
    A config/database.yml.ci
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Merge pull request #1930 from SoftwareDev/git

Solved major path issues, now consistent with SVN implementation


Compare: https://github.com/MarkUsProject/Markus/compare/9a3c5aff1f7e...4661e019f687

_______________________________________________
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]