1. 17 Jun, 2016 31 commits
  2. 16 Jun, 2016 9 commits
    • Stan Hu's avatar
      Use gitlab-git 10.2.0 · 91253a3a
      Stan Hu authored
      91253a3a
    • Douwe Maan's avatar
      Merge branch 'banzai-issue-filter-queries' into 'master' · 84632f0a
      Douwe Maan authored
      Reduce SQL query counts in IssueReferenceFilter
      
      ## What does this MR do?
      
      This MR adds a preparation phase for reference filters that allows them to prepare/create data structures used while iterating over HTML nodes. In this particular case the preparation phase is used for issue references to greatly cut down the amount of queries executed to get projects/issues for Markdown references.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Rendering Markdown containing issue references would run at most two queries for every issue reference: one to get the project and one to get the issue from said project. When rendering Markdown with lots of issue references this would result in _a lot_ of queries being executed.
      
      ## What are the relevant issue numbers?
      
      #18042
      
      See merge request !4410
      84632f0a
    • Jacob Schatz's avatar
      Merge branch 'tree-file-title' into 'master' · 0de44624
      Jacob Schatz authored
      Added title attribute to entries in tree view
      
      ## What does this MR do?
      
      Adds a title attribute to entries in the tree view. Moe useful when files have long names.
      
      ## What are the relevant issue numbers?
      
      Closes #18353 
      
      
      See merge request !4709
      0de44624
    • Jacob Schatz's avatar
      Merge branch 'merge-request-default-source-branch-text' into 'master' · e0f46ef1
      Jacob Schatz authored
      Added source branch text to dropdown toggle
      
      ## What does this MR do?
      
      Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch"
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-07_at_12.20.10](/uploads/40d31e21297a99300050cf9f23bd7371/Screen_Shot_2016-06-07_at_12.20.10.png)
      
      See merge request !4504
      e0f46ef1
    • Jacob Schatz's avatar
      Merge branch 'media-query-bug' into 'master' · 38d0b5b5
      Jacob Schatz authored
      Fix project header alignment media query bug
      
      ## What does this MR do?
      Fixes media query bug on project header
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-15_at_3.22.20_PM](/uploads/3d84f8ffb88c316f317048e15ffea4f3/Screen_Shot_2016-06-15_at_3.22.20_PM.png)
      
      See merge request !4689
      38d0b5b5
    • Jacob Schatz's avatar
      Merge branch 'dz-fix-mr-widget-padding' into 'master' · af1574e0
      Jacob Schatz authored
      Add bottom padding for merge request command line text
      
      Because without bottom padding text is too close to the UI tabs - hard to navigate
      
      
      
      See merge request !4681
      af1574e0
    • Jacob Schatz's avatar
      Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' into 'master' · 7b18e8c7
      Jacob Schatz authored
      Avoid a TypeError when initializing MergeRequest JS class with no arg
      
      ## What does this MR do?
      
      Avoid a TypeError when initializing MergeRequest JS class with no arg.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Without this sane default you would get the following error when you
      tried to instantiate a new MergeRequest object with no argument (i.e.
      `new MergeRequest();`):
          
          TypeError: undefined is not an object (evaluating 'this.opts.action')
      
      ## What are the relevant issue numbers?
      
      Fixes #13525.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] No CHANGELOG since it's a trivial internal change
      - [x] Tests
        - [x] Added for this feature/bug
        - [ ] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4667
      7b18e8c7
    • Jacob Schatz's avatar
      Merge branch 'mr-download-dropdown-alignment' into 'master' · 280c95fc
      Jacob Schatz authored
      Fixed alignment of download dropdown
      
      ## What does this MR do?
      
      Correctly aligns the download dropdown on merge requests
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-14_at_14.47.06](/uploads/9381f25110e5573e56aa5c3f46786df5/Screen_Shot_2016-06-14_at_14.47.06.png)
      
      See merge request !4646
      280c95fc
    • Jacob Schatz's avatar
      Merge branch 'push-event-banner-container' into 'master' · e11aae1a
      Jacob Schatz authored
      Fixed last push event banner not being in container
      
      ## What does this MR do?
      
      Adds the last push event content into a container with the correct class.
      
      ## What are the relevant issue numbers?
      
      Closes #18567 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-14_at_13.17.41](/uploads/4afa3d2c73e59c5ffbd53869e49baa92/Screen_Shot_2016-06-14_at_13.17.41.png)
      
      See merge request !4644
      e11aae1a