BigW Consortium Gitlab

  1. 19 Aug, 2016 40 commits
    • Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' · 310eef45
      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
    • Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' into 'master' · b06f9211
      Jacob Schatz authored
      17465 Fixed dropdown cursor key navigation
      
      ## What does this MR do?
      This MR fixes the use of cursor/arrow/enter key events with search dropdowns, allowing a user to navigate up and down the list with the arrow keys and then select their item with the enter key.
      It also applies some *minor* scroll user experience fixes, such as resetting the selected dropdown item every time it opens/closes (also stops multiple dropdowns conflicting) and forcing the dropdown scroll to scroll right to the top or bottom depending on whether they have selected the first or last item, respectively.
      
      ## Are there points in the code the reviewer needs to double check?
      I would like someone with GitLab experience to check over whether this would harm any unique implementations of the GitLabDropdown or SearchAutocomplete.
      
      ## Why was this MR needed?
      The current version has incorrectly behaving search dropdowns in the navbar, they either do not navigate using the keyboard or do not use the enter keystroke to select a highlighted item.
      
      ## What are the relevant issue numbers?
      Fixes #17465.
      Closes #20752.
      Closes #21014.
      **Contributes** to #20754.
      
      ## Screenshots (if relevant)
      ![17465.mp4](/uploads/1145abec226036abbaaa4aa46020f52b/17465.mp4)
      
      See merge request !4781
    • Support integration with Koding (online IDE) · a927a9bf
      Gokmen Goksel authored
      Koding: #index: landing page for Koding integration
      
      If enabled it will provide a link to open remote Koding instance url
      for now we are also providing the sneak preview video for how
      integration works in detail.
      
      Repository: check whether .koding.yml file exists on repository
      
      Projects: landing page: show Run in IDE (Koding) button if repo has stack file
      
      Projects: MR: show Run in IDE Koding button if repo has stack file on active branch
      
      ProjectHelpers: add_koding_stack: stack generator for provided project
      
      With this helper we will auto-generate the required stack template
      for a given project. For the feature we can request this base template
      from the running Koding instance on integration.
      
      Currently this will provide users to create a t2.nano instance on aws
      and it'll automatically configures the instance for basic requirements.
      
      Projects: empty state and landing page provide shortcuts to create stack
      
      projects_helper: use branch on checkout and provide an entry point
      
      This ${var.koding_queryString_branch} will be replaced with the branch
      provided in query string which will allow us to use same stack template
      for different branches of the same repository.
      
      ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b
      
      projects_helper: provide sha info in query string to use existing vms
      
      With this change we'll be able to query existing vms on Koding side
      based on the commit id that they've created.
      
      ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343
      
      Integration: Docs: Koding documentation added
      
      Disable /koding route if integration is disabled
      
      Use application settings to enable Koding
      
      Projects_helper: better indentation with strip_heredoc usage
      
      Projects_helper: return koding_url as is if there is no project provided
      
      current_settings: set koding_enabled: false by default
      
      Koding_Controller: to render not_found once integration is disabled
      
      Dashboard_specs: update spec for Koding enabled case
      
      Projects_Helper: make repo dynamic
      
      ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c
      
      Updated documentation to have right format
    • Merge branch 'mark-as-processable' into 'master' · c711fe15
      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
    • Merge branch… · 82a39e3e
      Douwe Maan authored
      Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master'
      
      Resolve "EmailsOnPushWorker incorrectly claims deleted a commit after a push"
      
      ## What does this MR do?
      
      Fix the comparison order in the emails on push worker, so regular pushes don't show a message about force pushing.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Don't think so, it was just a typo: `after_sha` should map to the `source_branch` argument, because it's the head of the comparison.
      
      ## Why was this MR needed?
      
      To fix a regression!
      
      ## What are the relevant issue numbers?
      
      Closes #21010.
      
      ## 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] ~~API support added~~
      - 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 !5894
    • Merge branch 'fix-discussions-on-changed-lines' into 'master' · 5e497e66
      Robert Speicher authored
      Fix bug where notes weren’t shown in discussion when the code had changed after creation
      
      See merge request !5908
    • Merge branch 'issue-boards-label-text-color' into 'master' · 2e34e5f1
      Robert Speicher authored
      Added text color to issues labels in issue board lists
      
      ## What does this MR do?
      
      Adds the text color for labels in the response. The frontend was
      already setup to handle this, just needed the data from the backend.
      
      See merge request !5898
    • Merge branch 'directory-names-containing-space' into 'master' · daa0cc1c
      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
    • Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' · eae636ed
      Robert Speicher authored
      Show wall-clock time when showing pipeline
      
      ## What does this MR do?
      
      Show wall-clock time when showing pipeline instead of cumulative builds time.
      
      Closes #17007
      
      See merge request !5734
    • Merge branch 'issue-boards-mobile-improvements' into 'master' · 66eb0185
      Jacob Schatz authored
      Improvements to issue boards on mobile
      
      ## What does this MR do?
      
      - Removes the drag handles
      - Adds a delay before dragging can start otherwise you can't scroll the page
      
      See merge request !5897
    • Merge branch 'expiration-date-on-memberships' into 'master' · 72503666
      Douwe Maan authored
      Expiration date on memberships
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495
      
      See merge request !5876
    • Merge branch 'ace-ventura' into 'master' · 8fc800cb
      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
    • Merge branch '20895-inline-comments-for-first-commit' into 'master' · cd102716
      Douwe Maan authored
      Fix line commenting for the initial commit
      
      ## What does this MR do?
      
      Support line positions on the initial commit, where we can't compare because there's no parent commit.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I chose to use the blank SHA to represent the initial commit, but it could as easily be the same SHA. I just thought this was clearer.
      
      ## Why was this MR needed?
      
      People couldn't add line comments to the initial commit!
      
      ## What are the relevant issue numbers?
      
      Closes #20895.
      
      ## Screenshots (if relevant)
      
      ![Comment_on_initial_commit](/uploads/1164448462ff55d133f3ff51c98044df/Comment_on_initial_commit.gif)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (N/A, regression)
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A)
      - [x] API support added (N/A)
      - 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 !5900
    • review changes · 8ade8258
      Luke Bennett authored
    • Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showing-pipeline · a49151f0
      Lin Jen-Shin authored
      * upstream/master: (50 commits)
        Increased vertical alignment of labels for issues in lists
        Changed file name Updated spec HAML
        Changed tests to use JS tests
        Addressed feedback
        Made logic simpler by moving away from underscorejs
        Added tooltip to label value in collapsed sidebar
        Add play icon SVG
        Have hover color of builds span full width
        Fix alignment of icon on commits page
        Change sleep to wait_for_ajax
        Added tests
        Destroy branch delete tooltip when row is removed
        Move and improvement comment in pipeline fixtures
        Fix notification_service argument error of declined invitation emails
        Update contribution acceptance criteria with tests requirements
        Fixed keyboard shortcuts not working on issue boards
        Hides tooltip when dragging Fixes issue with cursor not changing when dragging
        Hides tooltips when dragging issues
        Add a spec testing a second side effect of `Repository#merge`.
        drop execute bit
        ...
    • Merge branch '21081-repository-merge-in-progress-merge-commit-sha-spec' into 'master' · 1f127006
      Douwe Maan authored
      Add a spec testing a second side effect of `Repository#merge`.
      
      ## What are the relevant issue numbers?
      
      - Closes #21081
      - Related to gitlab-org/gitlab-ee!671
      - Related to gitlab-org/gitlab-ee#900
      
      See merge request !5886
    • Merge branch 'label-tooltip-sidebar-collapsed' into 'master' · 4ecfd74f
      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
    • Merge branch 'branch-delete-tooltip' into 'master' · 55cd2e79
      Jacob Schatz authored
      Destroy branch delete tooltip when row is removed
      
      ## What does this MR do?
      
      Destroys the tooltip when the branch row is deleted.
      
      ## What are the relevant issue numbers?
      
      Closes #19528
      
      See merge request !5120
    • Merge branch 'fix/pipeline-seeds-in-dev-env' into 'master' · 937d770a
      Robert Speicher authored
      Improve pipeline fixtures in development environment
      
      ### What does this MR do?
      
      This MR adds further improvements to seeds for development environment:
      
      * fixes build artifacts fixtures
      * fixes build log fixtures
      * moves unsuccessful jobs to the last triggered stage
      
      See merge request !5838
    • Merge branch 'x-bit' into 'master' · 3750a92d
      Robert Speicher authored
      Drop +x bit from .js and .css files
      
      See merge request !5885
    • Merge branch 'issue-board-label-spacing' into 'master' · cc7f64da
      Jacob Schatz authored
      Increased vertical alignment of labels for issues in lists
      
      ## What does this MR do?
      
      Increases the vertical alignment between labels on issues in issue boards lists.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-08-19_at_16.05.31](/uploads/4edc0fa520d1a0bf692d42d5f99ce4d7/Screen_Shot_2016-08-19_at_16.05.31.png)
      
      See merge request !5902
    • Removed commented code 💩 · abdd4ba8
      Phil Hughes authored
    • Improvements to issue boards on mobile · 888c0481
      Phil Hughes authored
    • Fix line commenting for the initial commit · 4a4c1765
      Sean McGivern authored
      The initial commit doesn't have a parent, so explicitly pass the blank
      SHA and handle that when calculating the position.
    • Merge branch 'issue-boards-keyboard-shortcuts' into 'master' · 206375c8
      Jacob Schatz authored
      Fixed keyboard shortcuts not working on issue boards
      
      ## What does this MR do?
      
      Fixes keyboard shortcuts not working on issue boards page.
      
      ## What are the relevant issue numbers?
      
      Closes #21071 
      
      See merge request !5890
    • Merge branch 'dz-test-required' into 'master' · 302caf59
      Robert Speicher authored
      Add test requirement for new files
      
      [ci skip]
      
      See merge request !5813
    • Merge branch 'issue-boards-tooltip-hide' into 'master' · 77d23a65
      Jacob Schatz authored
      Issue boards tooltip hide
      
      ## What does this MR do?
      
      - Hides & disables tooltips when dragging issues or lists
      - Fixes bug where cursor wouldn't change when dragging.
      
      See merge request !5889
    • Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' · d2f4c3ca
      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
    • Move editor paths to helper · 9cf6d451
      Sean McGivern authored
    • Merge branch 'pipelines-ui-updates' into 'master' · d0e77fb5
      Jacob Schatz authored
      Pipelines ui updates
      
      #### What does this MR do?
      * Fixes hover color width on build list
      * Fixes alignment of status icon on commits page
      * Add play icon SVG
      
      #### Why was this MR needed?
      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
    • Merge branch 'cs-fix-image-size-in-blob' into 'master' · 8d3ef366
      Jacob Schatz authored
      Fix small image previews in the file viewer.
      
      ## What does this MR do?
      
      Fixes image previews being smaller than they should be.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I don't think so.
      
      ## Why was this MR needed?
      
      Images were hard to view in the files view because they were limited to 50% of the file viewer's width.
      
      ## What are the relevant issue numbers?
      
      Mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/20505#note_13670085
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![Screen_Shot_2016-08-08_at_10.35.40_AM](/uploads/69d885d1c8bb6296f5ac61aab4a4bf91/Screen_Shot_2016-08-08_at_10.35.40_AM.png)
      
      After:
      
      ![Screen_Shot_2016-08-08_at_10.35.50_AM](/uploads/b78ed41a781228d9f170ed559a1fda25/Screen_Shot_2016-08-08_at_10.35.50_AM.png)
      
      cc: @rymai 
      
      See merge request !5721
    • Fix cron job key · 1e00e436
      Douwe Maan authored
    • Merge branch 'issue-boards-nav' into 'master' · 1e3743ae
      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
    • Merge branch 'mr-title' into 'master' · f92ba5bb
      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
    • Merge branch 'tag-edit-subnav' into 'master' · d3817ee7
      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