An error occurred fetching the project authors.
  1. 15 Jan, 2016 1 commit
  2. 13 Jan, 2016 1 commit
  3. 08 Jan, 2016 1 commit
  4. 25 Dec, 2015 1 commit
  5. 02 Dec, 2015 1 commit
  6. 19 Nov, 2015 1 commit
    • Robert Speicher's avatar
      Merge 8-2-stable into 8-2-stable-ee · ed2a8ba6
      Robert Speicher authored
      Conflicts remaining:
      
      - app/controllers/groups/group_members_controller.rb
      - app/controllers/projects/project_members_controller.rb
      - app/models/ability.rb
      - app/models/member.rb
      - app/models/project.rb
      ed2a8ba6
  7. 17 Nov, 2015 2 commits
  8. 06 Oct, 2015 1 commit
  9. 17 Sep, 2015 1 commit
  10. 16 Jun, 2015 1 commit
  11. 30 Apr, 2015 2 commits
  12. 08 Sep, 2014 1 commit
  13. 15 Jul, 2014 1 commit
  14. 18 Jul, 2013 2 commits
    • Dmitriy Zaporozhets's avatar
      fe7bef3a
    • Izaak Alpert's avatar
      MR on Fork multiple fixes · 489fa5d7
      Izaak Alpert authored
      -Disable observers post test run
      -Allow db:seed_fu RAILS_ENV=test to be run more than once without error
      -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
      -make notes/commits render against proper project
      -MR discussion file links should reference note's project
      -Added tests for commit links on edit merge request
      -fixes edit issues (canceling an edited mr, updating an edited mr)
      -updates tests with checks for source code updates
      -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)
      
      MR API: error on bad target_project
      
      -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
      -Fixes some busted (but hidden) test cases
      
      Conflicts:
      	app/views/merge_requests/show/_diffs.html.haml
      	spec/features/notes_on_merge_requests_spec.rb
      
      Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
      489fa5d7
  15. 23 Jun, 2013 1 commit
  16. 02 May, 2013 1 commit
  17. 21 Mar, 2013 2 commits
  18. 30 Jan, 2013 1 commit
  19. 27 Jan, 2013 1 commit
  20. 04 Jan, 2013 2 commits
  21. 03 Dec, 2012 3 commits
  22. 21 Nov, 2012 1 commit
  23. 26 Sep, 2012 1 commit
  24. 14 Sep, 2012 1 commit
  25. 02 Sep, 2012 1 commit
  26. 30 Aug, 2012 1 commit
  27. 10 Aug, 2012 1 commit
  28. 20 Jun, 2012 1 commit
  29. 03 Jun, 2012 1 commit
  30. 15 Apr, 2012 1 commit
  31. 14 Apr, 2012 2 commits
  32. 05 Apr, 2012 1 commit