1. 21 Oct, 2016 9 commits
    • Rémy Coutable's avatar
      Merge branch 'sh-fix-label-uniquness-migration' into 'master' · 075b6ba5
      Rémy Coutable authored
      Fix broken label uniqueness label migration
      
      The previous implementation of the migration failed on staging because
      the migration was attempted to remove labels from projects that did not
      actually have duplicates. This occurred because the SQL query did not
      account for the project ID when selecting the labels.
      
      To replicate the problem:
      
      1. Disable the uniqueness validation in app/models/label.rb.
      2. Create a duplicate label "bug" in project A.
      3. Create the same label in project B with label "bug".
      
      The migration will attempt to remove the label in B even if there are no duplicates.
      
      To fix the issue, include the project ID when selecting the labels.
      
      Closes #23609
      
      See merge request !7030
      075b6ba5
    • Robert Speicher's avatar
      Merge branch 'change-rubocop-to-2-1' into 'master' · cd2275ce
      Robert Speicher authored
      Change target Ruby version for RuboCop to 2.1
      
      We have to use the lowest common denominator to check the supported syntax and in our case it is Ruby 2.1. Please note that it will not help with unsupported syntax in HAML files because they are not checked by Rubocop.
      
      See merge request !6978
      cd2275ce
    • Rémy Coutable's avatar
      Merge branch 'patch-1' into 'master' · 257789e9
      Rémy Coutable authored
      [Doc] Fix `ref` parameter name for `commits/statuses`
      
      The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`).
      
      Tested on Gitlab CE 8.9.
      
      See merge request !4876
      257789e9
    • Yorick Peterse's avatar
      Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into 'master' · 60adbef4
      Yorick Peterse authored
      Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
      
      See merge request !6996
      60adbef4
    • Stan Hu's avatar
      Fix broken label uniqueness label migration · b332931a
      Stan Hu authored
      The previous implementation of the migration failed on staging because
      the migration was attempted to remove labels from projects that did not
      actually have duplicates. This occurred because the SQL query did not
      account for the project ID when selecting the labels.
      
      To replicate the problem:
      
      1. Disable the uniqueness validation in app/models/label.rb.
      2. Create a duplicate label "bug" in project A.
      3. Create the same label in project B with label "bug".
      
      The migration will attempt to remove the label in B even if there are no duplicates.
      
      Closes #23609
      b332931a
    • Rémy Coutable's avatar
      Merge branch 'sh-disable-warm-asset-cache-ci' into 'master' · e647af36
      Rémy Coutable authored
      Disable warming of the asset cache in Spinach tests under CI
      
      I suspect some combination of Knapsack tests cause no regular Rack tests
      to be loaded (i.e. all JavaScript tests), which leads to the error:
      
      ArgumentError: rack-test requires a rack application, but none was given
      
      In CI, we precompile all the assets so there is no need to warm the
      asset cache in any case.
      
      Closes #23613
      
      See merge request !7033
      e647af36
    • Sean Packham's avatar
      Merge branch 'edit-glossary' into 'master' · cf837df9
      Sean Packham authored
      Edit glossary
      
      Grammar fixes & new additions to the glossary page.
      
      See merge request !7027
      cf837df9
    • Stan Hu's avatar
      Disable warming of the asset cache in Spinach tests under CI · cf31a0f0
      Stan Hu authored
      I suspect some combination of Knapsack tests cause no regular Rack tests
      to be loaded (i.e. all JavaScript tests), which leads to the error:
      
      ArgumentError: rack-test requires a rack application, but none was given
      
      In CI, we precompile all the assets so there is no need to warm the
      asset cache in any case.
      
      Closes #23613
      cf31a0f0
    • Valery Sizov's avatar
      Merge branch... · 9df2115a
      Valery Sizov authored
      Merge branch '12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tags' into 'master'
      
      Fix: Backup restore doesn't clear cache
      
      ## What does this MR do?
      
      Clears cache when we do backup restoring. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12622
      
      
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/12622
      
      See merge request !7019
      9df2115a
  2. 20 Oct, 2016 31 commits