1. 21 Sep, 2016 15 commits
    • Rémy Coutable's avatar
      Merge branch 'fix/import-security-specs' into 'master' · cd9e3885
      Rémy Coutable authored
      Fix Import/Export security specs
      
      Related https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1987#note_83855
      
      See merge request !1997
      cd9e3885
    • James Lopez's avatar
      fixing security specs after merge · ce48a595
      James Lopez authored
      ce48a595
    • Rémy Coutable's avatar
      870324b5
    • Rémy Coutable's avatar
    • Vitaly Baev's avatar
    • Rémy Coutable's avatar
      Merge branch 'add_spec_for_committer_hash' into 'master' · a25ac8a8
      Rémy Coutable authored
      Add spec covering 'committer_hash'
      
      Adds a missing spec from changes added in !5822
      
      See merge request !6433
      a25ac8a8
    • Douwe Maan's avatar
      Merge branch 'bump-shell-to-3-6-0' into 'master' · dd12ffc0
      Douwe Maan authored
      Bump GITLAB_SHELL_VERSION to 3.6.0 for SSH support for LFS.
      
      cc @rdavila
      
      See merge request !6441
      dd12ffc0
    • Dmitriy Zaporozhets's avatar
    • Rémy Coutable's avatar
      Merge branch 'post-merge-improve-of-ci-permissions' into 'master' · 6df3dd9d
      Rémy Coutable authored
      Post-merge improve of CI permissions
      
      Improves code from !6409
      
      See merge request !6432
      6df3dd9d
    • Robert Speicher's avatar
      Merge branch 'cs-upgrade-sidekiq' into 'master' · 49405ac7
      Robert Speicher authored
      Upgrade Sidekiq to 4.2.1, remove dependency on Sinatra
      
      This updates Sidekiq to 4.2.1, which adds full support for Rails 5 by removing a dependency on Sinatra which was one of the remaining Rails 5 blockers.
      
      Major things to check: Sidekiq still works, obviously. Also that the Web UI/Admin dashboard works and doesn't lose any functionality (based on my testing it works fine).
      
      Working toward #14286.
      
      Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421
      
      See merge request !6349
      49405ac7
    • Stan Hu's avatar
      Merge branch '21170-cycle-analytics' into 'master' · 5416ab8a
      Stan Hu authored
      Cycle Analytics: first iteration
      
      ## What does this MR do?
      
      - Implement the first iteration of the "Cycle Analytics" feature.
      
      ## What are the relevant issue numbers?
      
      - Closes #21170 
      
      ## Screenshots
      
      ![cycle_analytics_screencast.gif](/uploads/d23c3c912caa6935fd47b53ca3a56b97/cycle_analytics.gif)
      
      ## Backend Tasks
      
      - [x]  Implementation
          - [x]  Phases
              - [x]  Issue (Tracker)
              - [x]  Plan (Board)
              - [x]  Code (IDE)
              - [x]  Test (CI)
              - [x]  Review (MR)
              - [x]  Staging (CD)
              - [x]  Production (Total)
          - [x]  Make heuristics more modular
          - [x]  Scope to project
          - [x]  Date range (30 days, 90 days)
          - [x]  Access restriction
      - [x]  Test
          - [x]  Find a better way to test these phases
          - [x]  Phases
              - [x]  Issue (Tracker)
              - [x]  Plan (Board)
              - [x]  Code (IDE)
              - [x]  Test (CI)
              - [x]  Review (MR)
              - [x]  Staging (CD)
              - [x]  Production (Total)
          - [x]  Test for "end case happens before start case"
          - [x]  Consolidate helper
      - [x]  Miniboss review
      - [x]  Performance testing with mock data
      - [x]  Improve performance
          - [x]  Pre-calculate "merge requests closing issues
          - [x]  Pre-calculate everything else
      - [x]  Test performance against 10k issues
      - [x]  Test all pre-calculation code
          - [x]  Ci::Pipeline -> build start/finish
          - [x]  Ci::Pipeline#merge_requests
          - [x]  Issue -> record default metrics after save
          - [x]  MergeRequest -> record default metrics after save
          - [x]  Deployment -> Update "first_deployed_to_production_at" for MR metrics
          - [x]  Git Push -> Update "first commit mention" for issue metrics
          - [x]  Merge request create/update/refresh -> Update "merge requests closing issues"
      - [x]  Remove `MergeRequestsClosingIssues` when necessary
      - [x]  Changes to unblock Fatih
          - [x]  Add summary data
          - [x]  `stats` should be array
          - [x]  Let `stats` be `null` if all `stats` are null
      - [x]  Indexes for "merge requests closing issues"
      - [x]  Test summary data
      - [x]  Scope everything to project
          - [x]  Find out why tests were passing
      - [x]  Filter should include issues/MRs which have made it to production within the range
      - [x]  Don't create duplicate `MergeRequestsClosingIssues`
      - [x]  Fix tests
      - [x]  MySQL median
      - [x]  Assign to Douwe for review
      - [x]  Fix conflicts
      - [x]  Implement suggestions from Yorick's review
          - [x]  Test on PG
          - [x]  Test on MySQL
      - [x]  Refactor
          - [x]  Cleanup
              - [x]  What happens if we have no data at all?
              - [x]  Extract common queries to methods / scopes
          - [x]  Remove unused queries
          - [x]  Downtime for foreign key migrations
          - [x]  Find a way around "if issue.metrics.present?" all over the place
          - [x]  Find a way around "if merge_request.metrics.present?" all over the place
          - [x]  Test migrations on a fresh database
              - [x]  MySQL
              - [x]  Pg
      - [x]  Access issues
          - While the project is public and the visibility is set to "Everyone with access", you cannot visit the cycle analytics page when signed out.
      - [x]  CHANGELOG
      - [x]  Implement suggestions from Douwe's review
          - [x]  First set of comments
          - [x]  Second set of comments
          - [x]  Third set of comments
          - [x]  Fourth set of comments
      - [x]  Make sure build is green
      - [ ]  Make issue for "polish"
      - [ ]  EE MR
      
      
      See merge request !5986
      5416ab8a
    • Timothy Andrew's avatar
      Implement fourth round of comments from @DouweM. · 244ec0a8
      Timothy Andrew authored
      - Pluralize summary titles
      - Remove the `run_query` method - always return sql strings from the
        `date_time_sql` methods
      244ec0a8
    • Timothy Andrew's avatar
      Fix `CreateDeploymentService` spec. · cc3adcd4
      Timothy Andrew authored
      1. The spec tests that if:
      
        - The merge request is merged
        - The target branch is deployed to production
        - The `first_deployed_to_production_at` metric is `nil` (for some reason)
        - The target branch is deployed to production again
        - The `first_deployed_to_production_at` metric stays as `nil` (and is
          not overwritten).
      
      2. Failure only on MySQL due to some datetime weirdness.
      cc3adcd4
    • Stan Hu's avatar
    • Patricio Cano's avatar
  2. 20 Sep, 2016 25 commits