1. 21 Sep, 2016 18 commits
    • James Lopez's avatar
      fix import/export security specs after merge · 3f55188d
      James Lopez authored
      3f55188d
    • Rémy Coutable's avatar
      Merge branch 'fix/import-security-specs' into 'master' · 98abf693
      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
      98abf693
    • Douwe Maan's avatar
    • Robert Speicher's avatar
      Merge branch 'slash-commands-load-fix' into 'master' · c525ec9b
      Robert Speicher authored
      Fixed slash commands not loading
      
      ## What does this MR do?
      
      Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed.
      
      ## What are the relevant issue numbers?
      
      Closes #21774, #21807
      
      See merge request !6207
      c525ec9b
    • Achilleas Pipinellis's avatar
      Merge branch 'doc/cycle-analytics' into 'master' · 01b896f3
      Achilleas Pipinellis authored
      Add docs on Cycle Analytics
      
      Document Cycle Analytics first iteration https://gitlab.com/gitlab-org/gitlab-ce/issues/21170
      
      See merge request !6437
      01b896f3
    • Yorick Peterse's avatar
      Merge branch 'issue_20078' into 'master' · 46f36341
      Yorick Peterse authored
      Test if issue authors can access private projects
      
      See merge request !6419
      46f36341
    • Rémy Coutable's avatar
      Merge branch 'post-merge-improve-of-ci-permissions' into 'master' · 2eb4d004
      Rémy Coutable authored
      Post-merge improve of CI permissions
      
      Improves code from !6409
      
      See merge request !6432
      2eb4d004
    • Douwe Maan's avatar
      Merge branch 'bump-shell-to-3-6-0' into 'master' · 16ebf6c2
      Douwe Maan authored
      Bump GITLAB_SHELL_VERSION to 3.6.0 for SSH support for LFS.
      
      cc @rdavila
      
      See merge request !6441
      16ebf6c2
    • Jacob Schatz's avatar
      Merge branch '20310-new-project-btn' into 'master' · 579aec79
      Jacob Schatz authored
      Fix new project button alignment
      
      ## What does this MR do?
      Increases the width of the button/search container to fit all items at smaller screen width. The left side of the row can only have a max of two tabs (All Projects, Shared Projects), so everything can still fit on one line until they resize for mobile
      
      ## Why was this MR needed?
      The `New project` button wrapped to next line at smaller screen width, breaking the layout
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-09-09_at_11.44.27_AM](/uploads/a726208deec6623d9fb62db0a549bf38/Screen_Shot_2016-09-09_at_11.44.27_AM.png)
      ![Screen_Shot_2016-09-09_at_11.46.29_AM](/uploads/bd8dc911757b14c5fafc4d3849e0b242/Screen_Shot_2016-09-09_at_11.46.29_AM.png)
      
      ## What are the relevant issue numbers?
      Closes #20310
      
      See merge request !6286
      579aec79
    • Rémy Coutable's avatar
      Merge branch 'limit-number-of-shown-environments' into 'master' · b4dbc373
      Rémy Coutable authored
      Limit number of shown environments
      
      ## What does this MR do?
      
      This MR limits in context of Merge Request a list of shown environments. Previously we would show all environments containing the SHA of the head commit of Merge Request. However, with introducing of dynamically created environments this lead to a cases that we would show multiple review apps, for different branches, because these branches would contain a new questioned commit.
      
      This MR changes what environments we test against presence of the commit, to:
      1. We look for environments with deployments to source_branch of source_project: used for deployments to per-branch environments,
      2. We look for environments with deployments to target_branch of target_project: used for deployments to staging / production environments,
      3. We look for environments with deployments for tags on target_project: used for staging / production environments.
      
      ## Why was this MR needed?
      
      To improve a list of returned environments when we introduced ability to create dynamic environments for review apps:
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6323
      
      See merge request !6438
      b4dbc373
    • Rémy Coutable's avatar
      Merge branch 'show-all-pipelines-from-all-diffs' into 'master' · 33bb5ddf
      Rémy Coutable authored
      Show all pipelines from all merge_request_diffs
      
      This way we could also show pipelines from commits which
      were discarded due to a force push.
      
      Closes #21889
      
      See merge request !6414
      33bb5ddf
    • Rémy Coutable's avatar
      Merge branch 'and-you-get-awards' into 'master' · 2f54abc5
      Rémy Coutable authored
      And Snippets get awards
      
      ## What does this MR do?
      
      Makes snippets more awesome, by making them awardables
      
      ## Why was this MR needed?
      
      Because Snippets were left behind.
      
      ## What are the relevant issue numbers?
      
      Closes #17878
      
      See merge request !4456
      2f54abc5
    • Stan Hu's avatar
      Merge branch '21170-cycle-analytics' into 'master' · 8ad412e0
      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
      8ad412e0
    • Rémy Coutable's avatar
      Merge branch 'add_spec_for_committer_hash' into 'master' · 84e6b80b
      Rémy Coutable authored
      Add spec covering 'committer_hash'
      
      Adds a missing spec from changes added in !5822
      
      See merge request !6433
      84e6b80b
    • Robert Speicher's avatar
      Merge branch 'rs-revert-rubocop-rspec-1-7' into 'master' · b9e02703
      Robert Speicher authored
      Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"
      
      Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6357
      due to rubocop-rspec dropping support for Ruby 2.1.
      
      See https://github.com/backus/rubocop-rspec/pull/131
      
      See merge request !6444
      b9e02703
    • Robert Speicher's avatar
      Merge branch 'zj-default-setting-features' into 'master' · d0f5d9a1
      Robert Speicher authored
      Add default values for ProjectFeature
      
      See merge request !6447
      d0f5d9a1
    • Rémy Coutable's avatar
    • Rémy Coutable's avatar
      Merge branch 'JonTheNiceGuy/gitlab-ce-Ubuntu-16.04-Package' · f60c82d0
      Rémy Coutable authored
      See gitlab-org/gitlab-ce!6247.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      f60c82d0
  2. 20 Sep, 2016 22 commits