1. 21 Oct, 2016 16 commits
    • Fatih Acet's avatar
      Merge branch 'compare-ellipsis-line' into 'master' · 0ba365f7
      Fatih Acet authored
      Fixed compare ellipsis messing with layout
      
      ## What does this MR do?
      
      Fixed a bug where the ellipsis would cause the form to mess with the layout.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-10-21_at_13.45.37](/uploads/d1dc18d294dace599b8036541b70ccaf/Screen_Shot_2016-10-21_at_13.45.37.png)
      
      See merge request !7042
      0ba365f7
    • Rémy Coutable's avatar
      Merge branch 'runners-paginate' into 'master' · 434ad2b9
      Rémy Coutable authored
      Fixes error 500 on Runners page (`ActionView::Template::Error (Missing partial kaminari/_paginator`)
      
      Originally reported downstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903
      
      See merge request !5701
      434ad2b9
    • Fatih Acet's avatar
      Merge branch 'fixed-mr-tabs-fixes' into 'master' · 3a6a6465
      Fatih Acet authored
      Fixed issues with sticky mr tabs & sidebar
      
      ## What does this MR do?
      
      - Fixes an issue where opening the sidebar wouldn't update the merge request tabs width & positioning
      - Fixes issues when resizing the browser
      
      Rather than updating the JS to react to different methods, this way allows the CSS to keep control of the positioning & sizes.
      
      ## What are the relevant issue numbers?
      
      Closes #23504
      
      See merge request !6990
      3a6a6465
    • Sean McGivern's avatar
      Merge branch 'fix_project_member_access_levels' into 'master' · 6c09fbd8
      Sean McGivern authored
      Fix project member access levels
      
      Migrate invalid project members (owner -> master)
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616
      
      See merge request !6957
      6c09fbd8
    • Phil Hughes's avatar
      Fixed compare ellipsis messing with layout · a74dfa30
      Phil Hughes authored
      a74dfa30
    • Rémy Coutable's avatar
      Merge branch 'master' into 'master' · 1e66061b
      Rémy Coutable authored
      Update Documentation image when configuring Build emails in Services
      
      ## What does this MR do?
      
      Replace old GitLab image in documentation with a new image showing the new position of Services and the module 'Build emails'
      
      ## Why was this MR needed?
      
      GitLab's layout changed with version 8.9 and the buttons were moved.
      
      See merge request !5139
      1e66061b
    • 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
    • Valery Sizov's avatar
      Fix project member access levels · 168197cd
      Valery Sizov authored
      168197cd
    • 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 24 commits