1. 30 Aug, 2017 5 commits
    • Lin Jen-Shin's avatar
      b6b90f06
    • Lin Jen-Shin's avatar
    • Lin Jen-Shin's avatar
      Resolve conflicts · 8d3378a3
      Lin Jen-Shin authored
      8d3378a3
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-30 · 710422a0
      Lin Jen-Shin authored
      * upstream/master: (103 commits)
        Fix broken Frontend JS guide
        Replace 'project/star.feature' spinach test with an rspec analog
        Adds position fixed to right sidebar
        Decrease Metrics/CyclomaticComplexity threshold to 15
        Prevents rendering empty badge when pipeline request fails
        Make file encoding dropdown consistent
        Fixes the diff changes buttons from toggling when scrolling
        exclude spec/ and features/ from `Style/PredicateName` cop
        Resolve "Monitoring graph date formatting is wrong"
        add changelog
        replace `is_ancestor` with `ancestor?`
        replace `is_member_of` with `member_of?`
        replace `has_n_stars` with `has_n_stars?`
        replace `has_matching_label` with `has_matching_label?`
        replace `is_team_member?` with `team_member?`
        replace `is_spam?` with `spam?`
        replace `is_default_branch?` with `default_branch?`
        replace `is_successful?` with `successful?`
        replace `is_multi_check?` with `multi_check?`
        replace `is_gitlab_user?` with `gitlab_user?`
        ...
      710422a0
    • Robert Speicher's avatar
      Merge branch 'replace_spinach_star.feature' into 'master' · 499b6406
      Robert Speicher authored
      Replace 'project/star.feature' spinach test with an rspec analog
      
      See merge request !13855
      499b6406
  2. 29 Aug, 2017 35 commits