An error occurred fetching the project authors.
  1. 31 Jan, 2014 1 commit
  2. 20 Jan, 2014 1 commit
  3. 11 Jan, 2014 1 commit
  4. 01 Jan, 2014 2 commits
  5. 31 Dec, 2013 2 commits
  6. 30 Dec, 2013 2 commits
  7. 20 Dec, 2013 1 commit
  8. 19 Dec, 2013 1 commit
  9. 14 Dec, 2013 1 commit
  10. 12 Dec, 2013 1 commit
  11. 12 Nov, 2013 1 commit
  12. 09 Sep, 2013 1 commit
  13. 08 Aug, 2013 2 commits
  14. 07 Aug, 2013 1 commit
  15. 18 Jul, 2013 7 commits
    • Izaak Alpert's avatar
      Rebase on master · 4d373005
      Izaak Alpert authored
      -Messed up part of the merge for _form.html.haml
      -Probably need discussion about what the new/edit merge page should look like now that it involves projects
      
      Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1
      4d373005
    • Izaak Alpert's avatar
      Fix an issue with edits sending user back to @source_project · 0a013adc
      Izaak Alpert authored
      -Form was for @source_project rather then @project.
      -add spinach test for edit submission on forked project
      
      Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
      0a013adc
    • 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: Email fixes, style fixes · 0ef055a4
      Izaak Alpert authored
      -Removed many extra spaces I added
      -Fixed email templates to be consistent/better looking
      
      GITLAB-894, GITLAB-895, (GITLAB-858)
      
      Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
      0ef055a4
    • Izaak Alpert's avatar
      MR on fork validation error · bbef8bb5
      Izaak Alpert authored
      Wasn't setting fields so validations would fail
      
      Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
      bbef8bb5
    • 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
  16. 17 Jul, 2013 2 commits
  17. 23 Jun, 2013 1 commit
  18. 21 Jun, 2013 2 commits
  19. 20 Apr, 2013 1 commit
  20. 31 Mar, 2013 1 commit
  21. 30 Jan, 2013 1 commit
  22. 29 Jan, 2013 1 commit
  23. 05 Jan, 2013 2 commits
  24. 04 Jan, 2013 2 commits
  25. 19 Dec, 2012 1 commit
  26. 26 Oct, 2012 1 commit
    • Sergio Visinoni's avatar
      Add Milestone information in Merge Requests · a7d08169
      Sergio Visinoni authored
      Step 1:
      * Add milestone_id in the model for merge_requests
      * Make it possible to create or update a Merge Request with an attached
        Milestone detail
      * Add the possibility to filter by Milestone and / or Assignee in the
        Merge Requests listing page
      a7d08169