1. 21 6月, 2016 11 次提交
    • P
      79c521f5
    • P
      Get ref_names from branch_names/tag_names cached · df663907
      Paco Guzman 提交于
      df663907
    • P
      Unify check branch name exist · 208b18c9
      Paco Guzman 提交于
      208b18c9
    • J
      Merge branch 'image-border' into 'master' · 74f8f260
      Jacob Schatz 提交于
      Add borders to images in issues, MRs, and Help.
      
      ## What does this MR do?
      
      Adds a gray border around images in Issues, MRs, and Help pages.
      
      ## Are there points in the code the reviewer needs to double check?
      
      That this doesn't effect other elements or pages that it shouldn't.
      
      ## Why was this MR needed?
      
      It was hard to differentiate between the actual interface and screenshots of it.
      
      ## What are the relevant issue numbers?
      
      Fixes #18578 
      
      ## Screenshots (if relevant)
      
      ### Issues/MRs
      
      Before:
      
      ![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png)
      
      After:
      
      ![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png)
      
      ![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png)
      
      ### Help
      
      Before:
      
      ![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png)
      
      After:
      
      ![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [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 !4655
      74f8f260
    • J
      Merge branch 'note-emoji-system-note' into 'master' · 681a3acf
      Jacob Schatz 提交于
      Hides award emoji & access level on system notes
      
      ## What does this MR do?
      
      Hides award emoji & access level on system notes as they aren't applicable to them notes.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png)
      
      See merge request !4629
      681a3acf
    • J
      Merge branch 'async-refs-dropdown' into 'master' · d5bbc860
      Jacob Schatz 提交于
      Refs dropdown is now loaded async
      
      ## What does this MR do?
      
      The refs dropdown is loaded async so not to block the page.
      
      ## What are the relevant issue numbers?
      
      Part of #18202
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png)
      
      See merge request !4508
      d5bbc860
    • A
      Merge branch '18584-document-request-access-feature' into 'master' · 503bbcc3
      Achilleas Pipinellis 提交于
      Document access request to project & group
      
      ## What does this MR do?
      
      Adds documentation that was missing from !3798.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome!
      
      ## What are the relevant issue numbers?
      
      Closes #18584.
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] Tests
        - [ ] 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 @DouweM 
      
      See merge request !4685
      503bbcc3
    • S
      Merge branch '18757-fix' into 'master' · 0e987ee7
      Stan Hu 提交于
      Fallback to group's owners/masters when a project has none for the "access requested email"
      
      ## What does this MR do?
      
      From b31c5052:
      
          Fallback to group's owners/masters when a project has none
          
          A project in a group can have no explicit owners/masters,
          in that case we fallbacks to the group's owners/masters.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Because of #18757.
      
      ## What are the relevant issue numbers?
      
      Fixes #18757.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] No need for CHANGELOG.
      - [x] No need for documentation.
      - [x] No API support added.
      - [x] Tests
        - [x] Added for this feature/bug
        - [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)
      
      See merge request !4791
      0e987ee7
    • J
      Merge branch 'markdowner' into 'master' · a0aaa6a0
      Jacob Schatz 提交于
      POC: Markdown shortcut buttons
      
      ## What does this MR do?
      Adds markdown shortcut buttons to text area for comments. 
      
      ## Are there points in the code the reviewer needs to double check?
      Because changing `textarea.val('something')` kills the natural browser undo stack, I had to implement a custom undo stack using state. You can't use the "undoable" state undo pattern because you need to go back to a previous state regardless of cursor position. The undo also adds an undo history item once you delete stuff or press enter.
      
      You can also edit multiple textareas at once and it will keep an undo history for each textarea individually, so the undo state should not collide between textareas.
      
      ## Why was this MR needed?
      It has been requested multiple times and the competition has it. https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433
      
      Libraries are available that already implement this functionality but they are enormous and bloaty. I implemented this in very few lines of code and kept it very simple and as minimal as possible. This was also some competitions approach. I believe so as to not include too much JS. 
      
      Adding extra buttons with new functionality **should only need new HTML and no new JS**.
      
      Only extra complex thing was adding a overridden undo stack, which was made as simple as possible as well.
      
      ## What are the relevant issue numbers?
      https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433
      
      ## Screenshots (if relevant)
      
      **NOTE:** One thing you cannot see in this screenshot is that I am pressing <kbd>Cmd</kbd><kbd>Z</kbd> to undo and <kbd>Cmd</kbd><kbd>Shift</kbd><kbd>Z</kbd> to redo which is the undo/redo stack I implemented. <kbd>Ctrl</kbd><kbd>Y</kbd> also works for redo. 
      ![markdown-editor](/uploads/2517bfb1a7b4269da7fcc4003c88b7f6/markdown-editor.gif)
      
      cc @dzaporozhets for UI
      
      cc @iamphill @alfredo1 for JS review
      
      cc @JobV if you like the idea.
      
      Fixes: #17185
      
      See merge request !4305
      a0aaa6a0
    • R
      Merge branch '17949-error-500-on-gitlab-org-when-visiting-pipelines' into 'master' · d32ac356
      Rémy Coutable 提交于
      Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view
      
      ## What does this MR do?
      
      Sets a default stage on old `ci_builds`.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Is the migration acceptable for online execution?
      
      ## Why was this MR needed?
      
      Old `ci_builds`with no stages cause a regression on the pipelines index view.
      
      ## What are the relevant issue numbers?
      
      #17949 
      
      Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680
      
      
      See merge request !4381
      d32ac356
    • S
      Merge branch 'patch-1' into 'master' · 032e3983
      Stan Hu 提交于
      Broken instructions. git fetch --all --tags doesn't refresh tags
      
      
      
      See merge request !4092
      032e3983
  2. 20 6月, 2016 28 次提交
  3. 19 6月, 2016 1 次提交