1. 23 Aug, 2016 10 commits
  2. 22 Aug, 2016 3 commits
  3. 21 Aug, 2016 2 commits
  4. 20 Aug, 2016 10 commits
  5. 19 Aug, 2016 15 commits
    • Achilleas Pipinellis's avatar
      Merge branch 'doc-refactor-description-templates' into 'master' · 4bb1db90
      Achilleas Pipinellis authored
      Refactor description templates documentation
      
      ## What are the relevant issue numbers?
      
      Refactors docs introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981
      
      See merge request !5839
      4bb1db90
    • Stan Hu's avatar
      Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' · 4030d5ab
      Stan Hu authored
      Koding Integration
      
      ## What does this MR do?
      
      Will provide Koding integration with GitLab services. Forked from !4914.
      
      ## Are there points in the code the reviewer needs to double check?
      I've introduced new layouts which might not be necessary, first time contributor. 
      
      ## Why was this MR needed?
      We're planning to ship Koding with GitLab.
      
      ## What are the relevant issue numbers?
      #12759 #14698 
      
      ## Screenshots (if relevant)
      
      ### Screencasts
      
      http://recordit.co/BDMbhwgxPD
      http://recordit.co/By0qiz1ClC
      
      ### Enable Koding in Application Settings
      
      ![image](/uploads/73a69421105c03aa2b0b47e2617d3fbc/image.png)
      
      ### Koding Dashboard
      ![image](/uploads/6c7dda34792280c0e4791e36af4eba11/image.png)
      
      ### Set up Koding Stack
      1 - ![image](/uploads/d5c2b93f8e61b5cbffdb06f0267d485f/image.png)
      2 - ![image](/uploads/44d9a9b574b8ac0c5eb553fb9653d5da/image.png)
      
      ### Run on Koding on Project Page
      
      ![image](/uploads/7d2b46221009074ffff75d66d5a1a555/image.png)
      
      ### Run in IDE on Merge Requests
      ![image](/uploads/65eed90c34c34b5fe7ad29ef9c717640/image.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)
      - [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 !5909
      4030d5ab
    • Jacob Schatz's avatar
      Merge branch 'ace-ventura' into 'master' · d53ef2e8
      Jacob Schatz authored
      Ace ventura
      
      ## What does this MR do?
      
      Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor.
      
      Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D
      
      Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB
      
      ## Are there points in the code the reviewer needs to double check?
      
      That this doesn't just completely break anything.
      
      ## Why was this MR needed?
      
      Ace is a big library, this allows us to only load it when necessary.
      
      ## What are the relevant issue numbers?
      
      #14372
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - 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 !4914
      d53ef2e8
    • Robert Speicher's avatar
      Merge branch 'label-tooltip-sidebar-collapsed' into 'master' · 930b1e4e
      Robert Speicher authored
      Added tooltip to label value in collapsed sidebar
      
      ## What does this MR do?
      
      Adds a list of the issuables labels to a tooltip in the collapsed
      sidebar. Limited to 5 otherwise the list could get crazy long.
      
      Closes #19398
      
      See merge request !5232
      930b1e4e
    • Robert Speicher's avatar
      Merge branch 'pipeline-hooks-without-slack' into 'master' · cd848910
      Robert Speicher authored
      Implement pipeline hooks, extracted from !5525
      
      Closes #20115
      
      See merge request !5620
      cd848910
    • Jacob Schatz's avatar
      Merge branch 'scroll-code-blocks' into 'master' · 24477045
      Jacob Schatz authored
      Wrap single lines of code; horizontally scroll multi-line code blocks
      
      ## What does this MR do?
      Original problem: code blocks were wrapping in issue body
      
      * Multi-line code blocks (```) should scroll horizontally
      * Single lines of code (`) should wrap
      
      ## Why was this MR needed?
      Inconsistent scrolling vs wrapping behavior
      
      ## What are the relevant issue numbers?
      Closes #19619 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-08-04_at_2.32.30_PM](/uploads/a4abcc81b57ffaa8dc8ce2b70a24bc21/Screen_Shot_2016-08-04_at_2.32.30_PM.png)
      
      
      See merge request !5675
      24477045
    • Robert Speicher's avatar
      Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' · f81dd64f
      Robert Speicher authored
      Show wall-clock time when showing pipeline
      
      Show wall-clock time when showing pipeline instead of cumulative builds time.
      
      Closes #17007
      
      See merge request !5734
      f81dd64f
    • Jacob Schatz's avatar
      Merge branch 'pipelines-ui-updates' into 'master' · 9d71605b
      Jacob Schatz authored
      Pipelines ui updates
      
      * Fixes hover color width on build list
      * Fixes alignment of status icon on commits page
      * Add play icon SVG
      
      Small UI bugs with recent MRs
      
      ![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png)
      ![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png)
      ![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png)
      
      See merge request !5856
      9d71605b
    • Douwe Maan's avatar
      Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' · 845d29a2
      Douwe Maan authored
      Render coverage badge using latest successful pipeline
      
      ## What does this MR do?
      
      This MR make test coverage badge to report value for the latest successful pipeline, instead of the latest one, regardless the status.
      
      Latest pipeline is often running, which makes coverage report inaccurate. Latest pipeline can be also the failed one, which may mean that not all stages got processed, therefore coverage report can be inaccurate as well.
      
      This also improves coverage badge performance because it is not necessary to touch repository to get recent SHA on the branch.
      
      ## Why was this MR needed?
      
      See #21013
      
      ## What are the relevant issue numbers?
      
      Closes #21013
      
      ## 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] 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 !5862
      845d29a2
    • Jacob Schatz's avatar
      Merge branch 'tag-edit-subnav' into 'master' · 04d5dfe4
      Jacob Schatz authored
      Fix layout of edit tags page
      
      #### What does this MR do?
      Fixes layout of edit tags page
      
      #### Why was this MR needed?
      Layout was broken
      
      #### Screenshots (if relevant)
      Before:    
      ![Screen_Shot_2016-08-18_at_1.33.00_PM](/uploads/9e9e52bdc0743971d6e0996e2c2030a0/Screen_Shot_2016-08-18_at_1.33.00_PM.png)
      After:    
      ![Screen_Shot_2016-08-18_at_1.32.08_PM](/uploads/0a4a93508f0c98cb0788a2c70ee33f4e/Screen_Shot_2016-08-18_at_1.32.08_PM.png)
      
      
      See merge request !5874
      04d5dfe4
    • Jacob Schatz's avatar
      Merge branch 'mr-title' into 'master' · 9c809a26
      Jacob Schatz authored
      Add space under MR title
      
      ## What does this MR do?
      Adds space underneath MR title because right now it's impossible to tell where the title ends and the first header of the MR body begins. 
      Before:   
      ![Screen_Shot_2016-08-18_at_1.43.05_PM](/uploads/4e07892036b1d90217fdecbed31a9494/Screen_Shot_2016-08-18_at_1.43.05_PM.png)
      
      After:    
      ![Screen_Shot_2016-08-18_at_1.42.22_PM](/uploads/1341d4d7c5bd0db21233f6ebb961bafc/Screen_Shot_2016-08-18_at_1.42.22_PM.png)
      
      
      Note: We need to change our template to have the md headers `####` instead of `##`. Once that's been done it will look like this:
      ![Screen_Shot_2016-08-18_at_1.46.46_PM](/uploads/e30d432551debc15ec210e76dfcd3451/Screen_Shot_2016-08-18_at_1.46.46_PM.png)
      
      See merge request !5875
      9c809a26
    • Douwe Maan's avatar
      Merge branch 'expiration-date-on-memberships' into 'master' · f6dc80c4
      Douwe Maan authored
      Expiration date on memberships
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495
      
      See merge request !5876
      f6dc80c4
    • Robert Speicher's avatar
      Merge branch 'directory-names-containing-space' into 'master' · ebc9d34d
      Robert Speicher authored
      Do not escape URI when extracting path
      
      ## What does this MR do?
      
      - remove escaping of URI parameters after they have already been unescaped in `ExtractsPath`
      - remove spec that is relying on that behavior
      
      ## Why was this MR needed?
      
      - spaces in directory names were escaped leading to 404 errors on repository files page
      
      ## What are the relevant issue numbers?
      
      fixes gitlab-com/support-forum#952, #21106
      
      See merge request !5878
      ebc9d34d
    • Robert Speicher's avatar
      Merge branch 'mark-as-processable' into 'master' · 594f9389
      Robert Speicher authored
      Make all future skipped builds as processable when retrying a build
      
      ## What does this MR do?
      
      Makes a builds that are marked as skipped when a pipeline is processed to be reprocessed by changing their's state to created.
      
      ## Why was this MR needed?
      
      Currently retry is broken. When you retry a build of pipeline it will succeed and be marked as succeeded, when the next stages should be triggered.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21066
      
      See merge request !5879
      594f9389
    • Jacob Schatz's avatar
      Merge branch 'issue-boards-nav' into 'master' · 54823279
      Jacob Schatz authored
      Add boards controller to issue nav item
      
      #### What does this MR do?
      Adds active state to top level nav
      
      Before: 
      ![Screen_Shot_2016-08-18_at_7.56.56_PM](/uploads/c5db0e9e077f0970b6b7b7d8d7a08147/Screen_Shot_2016-08-18_at_7.56.56_PM.png)
      
      After:   
      ![Screen_Shot_2016-08-18_at_7.56.10_PM](/uploads/6b46e6f093c02fb44e25cf6952638a5b/Screen_Shot_2016-08-18_at_7.56.10_PM.png)
      
      
      See merge request !5883
      54823279