BigW Consortium Gitlab

  1. 09 Sep, 2015 1 commit
  2. 08 Sep, 2015 1 commit
  3. 15 Apr, 2015 1 commit
    • Fix merge request comments on files with multiple commits · d4fec49a
      Dominik Sander authored
      Having a merge request with a comments on a line which is then changed
      in a later commit prevented new comments from properly showing up in the
      merge request show page.
      
       * `Note#set_diff` do not use stored the diff when creating a new note
         in merge requests (we can not be sure the diff did not changed since
         the last comment on that line)
       * Do not rely just on `outdated?` of the first note when displaying
         comments of a MR in the discussion tab, but partition the
         active/outdated notes and display them all
       * In the inline changes tab just select the active notes, so an
         outdated note does not prevent an active one from being rendered
       * Just show active comments in the side-by-side changes tab
  4. 24 Mar, 2015 1 commit
  5. 26 Aug, 2014 2 commits
  6. 24 Jun, 2014 3 commits
  7. 07 Apr, 2014 1 commit
  8. 24 Feb, 2014 1 commit
  9. 01 Jan, 2014 1 commit
  10. 30 Dec, 2013 2 commits
  11. 14 Dec, 2013 1 commit
    • Add time ago tooltips to show actual date/time · fa817dff
      Drew Blessing authored
      Clean up admin dashboad tooltips
      
      Clean up admin dashboad tooltips
      
      Clean up admin dashboad tooltips
      
      Add helper method
      
      change to use app helper
      
      Modify tooltips to use new helper
      
      Convert remaining times
      
      Adjust one tooltip
  12. 09 Oct, 2013 1 commit
  13. 04 Aug, 2013 1 commit
  14. 18 Jul, 2013 2 commits
    • Revert note.project references back to @project · 532809a1
      Izaak Alpert authored
      -removed extranious space from new_merge_request_email.text.erb
      
      Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
    • 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
  15. 23 Jun, 2013 1 commit
  16. 22 Jun, 2013 1 commit
  17. 27 Jan, 2013 1 commit
  18. 17 Jan, 2013 1 commit
  19. 15 Jan, 2013 1 commit
  20. 03 Dec, 2012 3 commits