1. 15 9月, 2016 1 次提交
    • T
      Improve performance of the cycle analytics page. · ba25e2f1
      Timothy Andrew 提交于
      1. These changes bring down page load time for 100 issues from more than
         a minute to about 1.5 seconds.
      
      2. This entire commit is composed of these types of performance
         enhancements:
      
           - Cache relevant data in `IssueMetrics` wherever possible.
           - Cache relevant data in `MergeRequestMetrics` wherever possible.
           - Preload metrics
      
      3. Given these improvements, we now only need to make 4 SQL calls:
      
          - Load all issues
          - Load all merge requests
          - Load all metrics for the issues
          - Load all metrics for the merge requests
      
      4. A list of all the data points that are now being pre-calculated:
      
          a. The first time an issue is mentioned in a commit
      
            - In `GitPushService`, find all issues mentioned by the given commit
              using `ReferenceExtractor`. Set the `first_mentioned_in_commit_at`
              flag for each of them.
      
            - There seems to be a (pre-existing) bug here - files (and
              therefore commits) created using the Web CI don't have
              cross-references created, and issues are not closed even when
              the commit title is "Fixes #xx".
      
          b. The first time a merge request is deployed to production
      
            When a `Deployment` is created, find all merge requests that
            were merged in before the deployment, and set the
            `first_deployed_to_production_at` flag for each of them.
      
          c. The start / end time for a merge request pipeline
      
            Hook into the `Pipeline` state machine. When the `status` moves to
            `running`, find the merge requests whose tip commit matches the
            pipeline, and record the `latest_build_started_at` time for each
            of them. When the `status` moves to `success`, record the
            `latest_build_finished_at` time.
      
          d. The merge requests that close an issue
      
            - This was a big cause of the performance problems we were having
              with Cycle Analytics. We need to use `ReferenceExtractor` to make
              this calculation, which is slow when we have to run it on a large
              number of merge requests.
      
            - When a merge request is created, updated, or refreshed, find the
              issues it closes, and create an instance of
              `MergeRequestsClosingIssues`, which acts as a join model between
              merge requests and issues.
      
            - If a `MergeRequestsClosingIssues` instance links a merge request
              and an issue, that issue closes that merge request.
      
      5. The `Queries` module was changed into a class, so we can cache the
         results of `issues` and `merge_requests_closing_issues` across
         various cycle analytics stages.
      
      6. The code added in this commit is untested. Tests will be added in the
         next commit.
      ba25e2f1
  2. 02 9月, 2016 1 次提交
  3. 01 9月, 2016 1 次提交
  4. 30 8月, 2016 3 次提交
    • S
      Use Repository#fetch_ref · 59dd9e57
      Sean McGivern 提交于
      59dd9e57
    • K
      User can edit closed MR with deleted fork · c9c2503c
      Katarzyna Kobierska 提交于
      Add test for closed MR without fork
      
      Add view test visibility of Reopen and Close buttons
      
      Fix controller tests and validation method
      
      Fix missing space
      
      Remove unused variables from test
      
      closed_without_fork? method refactoring
      
      Add information about missing fork
      
      When closed MR without fork can't edit target branch
      
      Tests for closed MR edit view
      
      Fix indentation and rebase, refactoring
      c9c2503c
    • S
      Fix resolving conflicts on forks · 1bda1e62
      Sean McGivern 提交于
      Forks may not be up-to-date with the target project, and so might not
      contain one of the parent refs in their repo. Fetch this if it isn't
      present.
      1bda1e62
  5. 18 8月, 2016 1 次提交
  6. 17 8月, 2016 1 次提交
  7. 15 8月, 2016 2 次提交
  8. 13 8月, 2016 4 次提交
  9. 12 8月, 2016 1 次提交
    • S
      api for generating new merge request · 6109daf4
      Scott Le 提交于
      DRY code + fix rubocop
      
      Add more test cases
      
      Append to changelog
      
      DRY changes list
      
      find_url service for merge_requests
      
      use GET for getting merge request links
      
      remove files
      
      rename to get_url_service
      
      reduce loop
      
      add test case for cross project
      
      refactor tiny thing
      
      update changelog
      6109daf4
  10. 03 8月, 2016 4 次提交
  11. 02 8月, 2016 2 次提交
  12. 01 8月, 2016 1 次提交
  13. 30 7月, 2016 1 次提交
    • S
      Properly abort a merge when merge conflicts occur · 60529e02
      Stan Hu 提交于
      If somehow a user attempted to accept a merge request that had
      conflicts (e.g. the "Accept Merge Request" button or the MR itself was
      not updated), `MergeService` did not properly detect that a conflict
      occurred. It would assume that the MR went through without any issues
      and close the MR as though everything was fine. This could cause
      data loss if the source branch were removed.
      
      Closes #20425
      60529e02
  14. 29 7月, 2016 2 次提交
  15. 18 7月, 2016 1 次提交
  16. 14 7月, 2016 1 次提交
  17. 13 7月, 2016 2 次提交
  18. 08 7月, 2016 1 次提交
  19. 07 7月, 2016 3 次提交
  20. 05 7月, 2016 1 次提交
  21. 02 7月, 2016 1 次提交
  22. 22 6月, 2016 1 次提交
    • S
      Fix auto-MR-close text from branch name · b2f60bb9
      Sean McGivern 提交于
      Rails's form helpers use the `$attr_before_type_cast` method where
      available, and this value only appears to be updated on assignment, not
      when the object is mutated in some other way:
      
          [1] pry(main)> mr = MergeRequest.new
          => #<MergeRequest:0x007fcf28395d88 ...>
          [2] pry(main)> mr.description = 'foo'
          => "foo"
          [3] pry(main)> mr.description << ' bar'
          => "foo bar"
          [4] pry(main)> mr.description
          => "foo bar"
          [5] pry(main)> mr.description_before_type_cast
          => "foo"
          [6] pry(main)> mr.description += ' bar'
          => "foo bar bar"
          [7] pry(main)> mr.description_before_type_cast
          => "foo bar bar"
      b2f60bb9
  23. 03 6月, 2016 3 次提交
  24. 02 6月, 2016 1 次提交