1. 20 Jun, 2016 30 commits
  2. 18 Jun, 2016 10 commits
    • Robert Speicher's avatar
      Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' · 98cede7e
      Robert Speicher authored
      Fix RangeError exceptions when referring to issues or merge requests outside of max database values
      
      When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values.
          
      Closes #18777
      
      See merge request !4777
      98cede7e
    • Phil Hughes's avatar
      55982c3d
    • Stan Hu's avatar
      Fix RangeError exceptions when referring to issues or merge requests outside of max database values · 7c9eba89
      Stan Hu authored
      When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we
      get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method
      that will throw out out-of-bounds values.
      
      Closes #18777
      7c9eba89
    • Jacob Schatz's avatar
      Merge branch 'star-fork-mobile' into 'master' · 0aab84c7
      Jacob Schatz authored
      Display Star and Fork on mobile, fix #18537.
      
      ## What does this MR do?
      
      Displays the Star and Fork buttons on mobile devices.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Nope.
      
      ## Why was this MR needed?
      
      I wanted to star and/or fork projects while on my phone, I couldn't do that before.
      
      ## What are the relevant issue numbers?
      
      #18537 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png)
      
      cc: @jschatz1 
      
      See merge request !4714
      0aab84c7
    • Jacob Schatz's avatar
      Merge branch 'milestones-show-mrs' into 'master' · 07669363
      Jacob Schatz authored
      Add merge request data to the progress information on Milestones pages.
      
      ## What does this MR do?
      
      Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I don't think so.
      
      ## Why was this MR needed?
      
      The milestone progress % didn't accurately reflect the open/merged MRs.
      
      ## What are the relevant issue numbers?
      
      Fixes #13980
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png)
      
      After:
      
      ![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] 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)
      
      cc: @jschatz1
      
      See merge request !4719
      07669363
    • Jacob Schatz's avatar
      Merge branch '18762-feedback-btn' into 'master' · 93ad4b13
      Jacob Schatz authored
      Fix margin & padding on activity btn
      
      ## What does this MR do?
      Fixes alignment of activity btn
      
      ## What are the relevant issue numbers?
      Closes #18762 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png)
      
      
      See merge request !4750
      93ad4b13
    • Jacob Schatz's avatar
      Merge branch 'comment-form-button-spacing' into 'master' · 81204f3d
      Jacob Schatz authored
      Fixed alignment of buttons in note forms
      
      ## What does this MR do?
      
      Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png)
      
      ![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png)
      
      
      See merge request !4740
      81204f3d
    • Jacob Schatz's avatar
      Merge branch 'dz-organize-admin-settings' into 'master' · e73ace4c
      Jacob Schatz authored
      Move admin->runners tab as subnav of overview tab
      
      cc @annabeldunstone 
      
      See merge request !4716
      e73ace4c
    • Jacob Schatz's avatar
      Merge branch 'tags-edit-tooltip-placement' into 'master' · a61550a8
      Jacob Schatz authored
      Fixed tooltip placement on edit tags button
      
      ## What does this MR do?
      
      Moves the placement of the tooltip to the body so not to affect the movement of the button.
      
      ## Screenshots (if relevant)
      
      Old:
      
      ![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif)
      
      New:
      
      ![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif)
      
      
      See merge request !4737
      a61550a8
    • Jacob Schatz's avatar
      Merge branch 'branch-buttons-size' into 'master' · d0bca4b8
      Jacob Schatz authored
      Fixed size of buttons in branches list
      
      ## What does this MR do?
      
      The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags
      
      ## What are the relevant issue numbers?
      
      #18677 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-17_at_10.38.31](/uploads/19fc173e3f549a84bb14517613403792/Screen_Shot_2016-06-17_at_10.38.31.png)
      
      See merge request !4735
      d0bca4b8