1. 08 5月, 2014 1 次提交
  2. 11 4月, 2014 1 次提交
  3. 08 4月, 2014 1 次提交
  4. 03 4月, 2014 1 次提交
  5. 25 3月, 2014 1 次提交
  6. 01 3月, 2014 1 次提交
  7. 26 2月, 2014 2 次提交
  8. 25 2月, 2014 1 次提交
  9. 19 2月, 2014 1 次提交
  10. 18 2月, 2014 1 次提交
  11. 13 2月, 2014 1 次提交
  12. 31 1月, 2014 1 次提交
  13. 23 1月, 2014 2 次提交
  14. 22 1月, 2014 1 次提交
  15. 20 1月, 2014 2 次提交
  16. 15 1月, 2014 2 次提交
  17. 13 1月, 2014 1 次提交
  18. 26 12月, 2013 1 次提交
  19. 25 12月, 2013 1 次提交
  20. 20 12月, 2013 1 次提交
  21. 19 12月, 2013 1 次提交
  22. 14 12月, 2013 1 次提交
  23. 12 12月, 2013 2 次提交
  24. 02 12月, 2013 1 次提交
  25. 07 9月, 2013 1 次提交
    • B
      Improved large commit handling. · 01ff084a
      Boyan Tabakov 提交于
      Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
      
      A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
      resource usage with huge commits.
      
      Related to #1745, #2259
      
      In addition, handle large commits for MergeRequests and Compare controllers.
      
      Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
      01ff084a
  26. 26 8月, 2013 1 次提交
    • A
      Link issues from comments and automatically close them · c8a115c0
      ash wilson 提交于
      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
  27. 20 8月, 2013 1 次提交
  28. 11 8月, 2013 1 次提交
  29. 08 8月, 2013 1 次提交
  30. 01 8月, 2013 1 次提交
  31. 18 7月, 2013 5 次提交
    • I
      Fix an issue with edits sending user back to @source_project · 0a013adc
      Izaak Alpert 提交于
      -Form was for @source_project rather then @project.
      -add spinach test for edit submission on forked project
      
      Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
      0a013adc
    • I
      Fix merge_requests_controller · 0e82c981
      Izaak Alpert 提交于
      -update new to be simplified (set values from parms via rails) instead of doing it by hand
      -change def merge_request to look up the merge request against the current @project
      
      Change-Id: I778c91b87c6da84b73f8f59013c27b74d290d8b1
      0e82c981
    • I
      Style changes from review with @randx · d9959427
      Izaak Alpert 提交于
      -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
      
      Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
      d9959427
    • I
      MR on fork validation error · bbef8bb5
      Izaak Alpert 提交于
      Wasn't setting fields so validations would fail
      
      Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
      bbef8bb5
    • I
      MR on Fork multiple fixes · 489fa5d7
      Izaak Alpert 提交于
      -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