Skip to content
Snippets Groups Projects
  1. Oct 09, 2013
  2. Aug 21, 2013
  3. Aug 20, 2013
  4. Aug 05, 2013
  5. Jul 18, 2013
    • 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
      Rebased on 6.0 · 128f2845
      Izaak Alpert authored
      -Had to do some minor test clean up as well
      
      Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
      128f2845
    • 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
  6. Jul 16, 2013
  7. Jul 10, 2013
  8. Jul 01, 2013
  9. Jun 24, 2013
  10. Jun 22, 2013
  11. Jun 13, 2013
  12. May 19, 2013
  13. May 16, 2013
  14. May 06, 2013
  15. May 02, 2013
    • Stephen Lottermoser's avatar
      Fix internally public projects tests · a7ba81ea
      Stephen Lottermoser authored
      Takes into account 98bea4b1 and 3b88636d.
      a7ba81ea
    • Stephen Lottermoser's avatar
      Internally public projects · 4c44c5ef
      Stephen Lottermoser authored
      Public projects listed in the public section will be linked to the
      actual project's page. Public projects now give any user Guest
      permissions to the project, allowing them to download the code, read
      and create issues, and view anything else in the project's pages.
      
      Ample access tests have been added to the project_access_spec to
      verify correct permissions and behavior on public projects.
      - Visitors to the site who are not logged in still cannot view the
        project's pages.
      - Logged-in users visiting a public project where they are not a team
        member can create issues, but not snippets. They can view the projects
        code, issues, merge requests, etc, just as if they were a Guest member
        of the project.
      - Since this is a public project, the user is also granted :download_code
        permissions, a permission normally reserved for Reporters, since they
        can clone the repo anyways and browse commits and branches locally.
      4c44c5ef
  16. Apr 18, 2013
  17. Apr 11, 2013
  18. Apr 10, 2013
  19. Apr 02, 2013
  20. Apr 01, 2013
  21. Mar 28, 2013
  22. Mar 25, 2013
Loading