1. 30 Oct, 2018 36 commits
  2. 29 Oct, 2018 4 commits
    • Stan Hu's avatar
      Fix extra merge request versions created from forked merge requests · 2f1c6e43be34
      Stan Hu authored
      When a forked merge request was created with the same branch name as the
      target name, MergeRequests::RefreshService would always create a new
      diff even though nothing had changed. For example, on GitLab.com:
      
      1. There were a number of merge requests in the gitlab-ce and www-gitlab-com
      projects that had old merge requests from the community.
      2. These merge requests originated from forked projects and used the
      source branch master.
      3. When someone pushed to master in the main repository, MergeRequests::RefreshService
      would see that master matched the merge requests in question and generated a new
      diff.
      4. This led to an explosion of merge request diffs and slowed down the "Changes"
      tab considerably.
      
      This change alters MergeRequests::RefreshService so that it will only
      refresh the diff if the merge request's source project and branch
      match. Otherwise, the refresh will only happen if a pushed commit
      contains a commit relevant to the existing merge request.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53153
      2f1c6e43be34
    • Mike Greiling's avatar
      Merge branch 'update-gitlab-ui' into 'master' · 32675eb914b1
      Mike Greiling authored
      Update gitlab-ui to 1.9.0
      
      See merge request gitlab-org/gitlab-ce!22632
      32675eb914b1
    • Clement Ho's avatar
      Update gitlab-ui to 1.9.0 · 396efff524f3
      Clement Ho authored
      396efff524f3
    • Mike Greiling's avatar
      Merge branch '53270-remove-mousetrap-rails' into 'master' · 0b19c52eea3f
      Mike Greiling authored
      Remove mousetrap-rails gem
      
      Closes #53270
      
      See merge request gitlab-org/gitlab-ce!22647
      0b19c52eea3f