1. 20 Oct, 2016 7 commits
    • Lin Jen-Shin's avatar
    • Lin Jen-Shin's avatar
      Move CHANGELOG entry · a87b6cc3
      Lin Jen-Shin authored
      a87b6cc3
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into pipeline-notifications · e5de4c77
      Lin Jen-Shin authored
      * upstream/master: (221 commits)
        Differentiate the expire from leave event
        Use LabelsFinder on Fogbuz importer
        Use LabelsFinder on Google Code importer
        Change the order of tested methods in project_members_controller_spec
        Remove show_menu_above attribute from issuable dropdowns.
        Spaces before `}`!
        Avoid touch label links that does not belongs to project when moving it
        Remove order by label type on LabelsFinder
        Rename Labels::CreateService to Labels::FindOrCreateService
        Add self.project_foreign_key on both Issue and MergeRequest
        Only show label type for projects that belong to a group
        Disable subscribing to group-level labels
        Remove unused method Project#all_labels
        Update specs to cope with new label types and priorities
        Fix max number of permitted priorities per project label
        Fix GitHub importer spec
        Update CHANGELOG
        Add support to group labels to SlashCommands::InterpretService
        Use join instead of subquery on Label.unprioritized scope
        Warn user deleting a group label affect all projects within the group
        ...
      e5de4c77
    • Sean McGivern's avatar
      Merge branch 'add_user_expire_leave_event' into 'master' · b5cee666
      Sean McGivern authored
      Differentiate the expire from leave event
      
      At the moment we cannot see whether a user left a project due to their
      membership expiring or if they themselves opted to leave the project.
      This adds a new event type that allows us to make this differentiation.
      Note that is not really feasible to go back and reliably fix up the
      previous events. As a result the events for previous expire removals
      will remain the same however events of this nature going forward will be
      correctly represented.
      
      Closes #22611 
      
      ![Screen_Shot_2016-10-06_at_09.27.52](/uploads/e4de7bd2cdedc64a9b19e56fefa21314/Screen_Shot_2016-10-06_at_09.27.52.png)
      
      See merge request !6717
      b5cee666
    • Fatih Acet's avatar
      Merge branch 'boards-blank-state-size-fix' into 'master' · 192a6eaf
      Fatih Acet authored
      Fixed height of issue board blank state
      
      ## What does this MR do?
      
      The height of the issue board blank state was causing some weird scrolling issues. This MR changes the height of the blank state.
      
      See merge request !6960
      192a6eaf
    • Fatih Acet's avatar
      Merge branch '23346-pipeline-buttons-cutoff' into 'master' · 8608beed
      Fatih Acet authored
      Smaller min-width for MR pipeline table
      
      ## What does this MR do?
      Nests class under `.tab-pane` to make sure buttons don't get cut off
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-10-14_at_11.00.02_AM](/uploads/6e19e0375721f2cb58223c2e7ed89308/Screen_Shot_2016-10-14_at_11.00.02_AM.png)
      
      ## What are the relevant issue numbers?
      Closes #23346
      
      See merge request !6893
      8608beed
    • Callum Dryden's avatar
      Differentiate the expire from leave event · 9124310f
      Callum Dryden authored
      At the moment we cannot see weather a user left a project due to their
      membership expiring of if they themselves opted to leave the project.
      This adds a new event type that allows us to make this differentiation.
      Note that is not really feasable to go back and reliably fix up the
      previous events. As a result the events for previous expire removals
      will remain the same however events of this nature going forward will be
      correctly represented.
      9124310f
  2. 19 Oct, 2016 33 commits