1. 03 Apr, 2014 1 commit
  2. 02 Apr, 2014 4 commits
  3. 25 Mar, 2014 1 commit
  4. 14 Mar, 2014 1 commit
  5. 21 Feb, 2014 1 commit
  6. 14 Feb, 2014 1 commit
    • Jason Hollingsworth's avatar
      Add email aliases for users · 29cfd33d
      Jason Hollingsworth authored
      Emails are used to associate commits with users. The emails
      are not verified and don't have to be valid email addresses. They
      are assigned on a first come, first serve basis.
      
      Notifications are sent when an email is added.
      29cfd33d
  7. 22 Jan, 2014 1 commit
  8. 14 Dec, 2013 1 commit
  9. 10 Dec, 2013 2 commits
  10. 09 Dec, 2013 1 commit
  11. 04 Dec, 2013 1 commit
  12. 10 Oct, 2013 3 commits
  13. 12 Sep, 2013 1 commit
  14. 26 Aug, 2013 1 commit
    • ash wilson's avatar
      Link issues from comments and automatically close them · c8a115c0
      ash wilson authored
      Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
      references in descriptions, titles, or attached Notes creates a back-reference
      Note that links to the original referencer. Furthermore, pushing commits with
      commit messages that match a (configurable) regexp to a project's default
      branch will close any issues mentioned by GFM in the matched closing phrase.
      If accepting a merge request would close any Issues in this way, a banner is
      appended to the merge request's main panel to indicate this.
      c8a115c0
  15. 14 Aug, 2013 1 commit
  16. 18 Jul, 2013 3 commits
    • Izaak Alpert's avatar
      Style changes from review with @randx · d9959427
      Izaak Alpert authored
      -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
      
      Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
      d9959427
    • 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
    • Izaak Alpert's avatar
      Merge Request on forked projects · 3d7194f0
      Izaak Alpert authored
      The good:
      
       - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
       - Push events take into account merge requests on forked projects
       - Tests around merge_actions now present, spinach, and other rspec tests
       - Satellites now clean themselves up rather then recreate
      
      The questionable:
      
       - Events only know about target projects
       - Project's merge requests only hold on to MR's where they are the target
       - All operations performed in the satellite
      
      The bad:
      
        -  Duplication between project's repositories and satellites (e.g. commits_between)
      
      (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)
      
      Fixes:
      
      Make test repos/satellites only create when needed
      -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
      -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
      -fixed remote removal
      -How to merge renders properly
      -Update emails to show project/branches
      -Edit MR doesn't set target branch
      -Fix some failures on editing/creating merge requests, added a test
      -Added back a test around merge request observer
      -Clean up project_transfer_spec, Remove duplicate enable/disable observers
      -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
      -Signifant speed ups for tests
      -Update formatting ordering in notes_on_merge_requests
      -Remove wiki schema update
      Fixes for search/search results
      -Search results was using by_project for a list of projects, updated this to use in_projects
      -updated search results to reference the correct (target) project
      -udpated search results to print both sides of the merge request
      
      Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
      3d7194f0
  17. 25 Jun, 2013 1 commit
  18. 05 May, 2013 1 commit
  19. 01 May, 2013 1 commit
  20. 10 Apr, 2013 1 commit
  21. 26 Mar, 2013 3 commits
  22. 20 Mar, 2013 1 commit
  23. 05 Mar, 2013 1 commit
  24. 18 Feb, 2013 2 commits
  25. 13 Feb, 2013 1 commit
  26. 11 Feb, 2013 1 commit
  27. 05 Feb, 2013 1 commit
  28. 28 Jan, 2013 1 commit
  29. 15 Jan, 2013 1 commit