1. 01 Jul, 2016 9 commits
    • Rémy Coutable's avatar
      Merge branch '18310-improve-request-access-button' into 'master' · c578fb06
      Rémy Coutable authored
      Improve the request / withdraw access button
      
      ## What does this MR do?
      
      It implements the design proposed in #18310.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      To close #18310.
      
      ## What are the relevant issue numbers?
      
      Closes #18310.
      
      ## Screenshots
      
      ### Group access request
      
      #### Request button
      
      | Medium | Large |
      | ----------- | ------- |
      | ![request_access_button](/uploads/a1de370dcbb8ac9a63d2df5c68591db7/request_access_button.png) | ![request_access_button-large](/uploads/0a1c70380268e620a6ca4d3e1661d58c/request_access_button-large.png) |
      
      #### Withdraw request button
      
      | Medium | Large |
      | ----------- | ------- |
      | ![withdraw_access_request_button](/uploads/c9df39d04b61566ec143d5e9cc43ada2/withdraw_access_request_button.png) | ![withdraw_access_request_button-large](/uploads/10fdaa94d72956e06bdb995e65b51472/withdraw_access_request_button-large.png) |
      
      ### Project access request
      
      #### Request button
      
      | Medium | Large |
      | ----------- | ------- |
      | ![request_access_button](/uploads/8e71395041a5cea996a35df2083bb723/request_access_button.png) | ![project-request_access_button-large](/uploads/adb2dec0eccec8e5171dc0e26e6b03a6/project-request_access_button-large.png) |
      
      #### Withdraw request button
      
      | Medium | Large |
      | ----------- | ------- |
      | ![withdraw_access_request_button](/uploads/12be06f0a2bf9426a5e043f52c4d1dab/withdraw_access_request_button.png) | ![project-withdraw_access_request_button-large](/uploads/93fda7767ee5f02186c4c954ea346254/project-withdraw_access_request_button-large.png) |
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - Tests
        - [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 !4860
      c578fb06
    • Yorick Peterse's avatar
      Merge branch '18592-syntaxhighlighter-slow' into 'master' · 4bb41c5e
      Yorick Peterse authored
      Specific metrics for code on Banzai::Filter::SyntaxHighlightFilter
      
      See merge request !5038
      4bb41c5e
    • Rémy Coutable's avatar
      8625bd36
    • Paco Guzman's avatar
    • Rémy Coutable's avatar
      Merge branch 'enable-shared-runners-with-admins' into 'master' · b569f842
      Rémy Coutable authored
      Admin should be able to turn shared runners into specific ones:
      
      ## What does this MR do?
      
      Make sure admins could turn shared runners into specific runners.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Is this the desired behaviour?
      
      ## Why was this MR needed?
      
      Closes #19039
      Closes #19272
      
      ![Screen_Shot_2016-06-30_at_9.30.05_PM](/uploads/97eb3b4923fd4e498b1f8ca70b1345c8/Screen_Shot_2016-06-30_at_9.30.05_PM.png)
      
      See merge request !4961
      b569f842
    • Yorick Peterse's avatar
      Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into 'master' · a647d557
      Yorick Peterse authored
      Avoid instantiation of a Git::Tree
      
      See merge request !4997
      a647d557
    • Lin Jen-Shin's avatar
      03dcb690
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into enable-shared-runners-with-admins · 08070c76
      Lin Jen-Shin authored
      * upstream/master: (120 commits)
        Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.
        Remove additional entries from CHANGELOG
        Catch permission denied errors and ignore the disk
        Remove coveralls lines
        Make GH one-off auth the default again for importing GH projects
        Import from Github using Personal Access Tokens.
        Remove hardcoded gitlab-shell version in test env now that the required tag is published
        Updated breakpoint for sidebar pinning
        Expire branch/tag git data when needed.
        Remove unnecessary parens
        Enable Style/UnneededCapitalW Rubocop cop
        Expiry date on pinned nav cookie
        Fix broken spec in git_push_service_spec by stubbing an external issue tracker
        Handle external issues in IssueReferenceFilter
        Move Changelog entry for build retry fix to 8.9.4
        Add Changelog entry for build sidebar retry link fix
        Improve method that tells if build is retryable
        Do not show build retry link when build is active
        Remove coveralls as its unused
        Move changelot item "Add sub nav to file page view" to 8.9.4
        ...
      08070c76
    • Stan Hu's avatar
      Merge branch 'improve-system-info' into 'master' · ab81ea1e
      Stan Hu authored
      Catch permission denied errors and ignore the disk
      
      
      
      See merge request !5017
      ab81ea1e
  2. 30 Jun, 2016 31 commits