1. 10 Aug, 2016 2 commits
    • Achilleas Pipinellis's avatar
      Merge branch 'default-label-documentation' into 'master' · 2aad2f05
      Achilleas Pipinellis authored
      Clarify the features for generating default label sets
      
      ## What does this MR do?
      
      * Split out the information regarding the label set that GitLab can generate
      * Add information for the labels view in the Admin panel
      
      ## Are there points in the code the reviewer needs to double check?
      
      * Please ensure that the newly added section relating to the Admin area seems relevant
      * Please verify adherence to the documentation styleguide
      
      ## Why was this MR needed?
      
      Documentation regarding default label sets was missing
      
      ## What are the relevant issue numbers?
      Closes #1865
      
      See merge request !5736
      2aad2f05
    • Douwe Maan's avatar
      Merge branch 'rs-rename-run-helper' into 'master' · 46015c15
      Douwe Maan authored
      Rename `run` task helper method to prevent conflict with StateMachine
      
      This prevents the following message from appearing whenever running a
      Rake task:
      
          Instance method "run" is already defined in Object, use generic
          helper instead or set StateMachines::Machine.ignore_method_conflicts
          = true.
      
      See merge request !5750
      46015c15
  2. 09 Aug, 2016 29 commits
  3. 08 Aug, 2016 9 commits