1. 08 Jun, 2016 4 commits
    • Grzegorz Bizon's avatar
      cba266aa
    • Grzegorz Bizon's avatar
      Merge branch 'master' into refactor/ci-config-add-global-entry · 2b48da22
      Grzegorz Bizon authored
      * master: (285 commits)
        Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
        Load knapsack in Rakefile only when is bundled
        Add License Finder information to contribution acceptance criteria.
        Add LGPLv2 to license whiltelist
        Instrument `RepositoryCheck::SingleRepositoryWorker` manually
        Bump nokogiri to 1.6.8
        Fix alignment of wiki top area
        Update charcoal theme colors
        Update nav link font size and spacing; fix hamburger icon
        Fix control btn position
        Remove todos count tests in nav
        Test impersonation using img data attribute instead of username
        Implement compact side nav
        Fix knapsack for master
        Align links and tabs
        Add scrolling tabs to code subnav
        Finish styling sub nav
        Updated colors
        Fixed failing tests
        CHANGELOG item
        ...
      
      Conflicts:
      	lib/gitlab/ci/config.rb
      	spec/lib/gitlab/ci/config_spec.rb
      2b48da22
    • Jacob Schatz's avatar
      Merge branch '18080-project-header-alignment' into 'master' · 915ad255
      Jacob Schatz authored
      Add flexbox to project header
      
      ## What does this MR do?
      Adds flexbox to project header to keep components vertically centered regardless of description presence/length
      
      ## What are the relevant issue numbers?
      Closes  #18080 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-01_at_12.02.42_PM](/uploads/edd769110b52ec34046f4079619e45eb/Screen_Shot_2016-06-01_at_12.02.42_PM.png)     
      ![Screen_Shot_2016-06-01_at_12.02.35_PM](/uploads/c5c2828ba5688a2588d3721a2d21d5fe/Screen_Shot_2016-06-01_at_12.02.35_PM.png)
      
      See merge request !4417
      915ad255
    • Jacob Schatz's avatar
      Merge branch '18074-cancel-pipeline-text' into 'master' · 402767e0
      Jacob Schatz authored
      Change color of canceled ci text to gray
      
      ## What does this MR do?
      Change text color of Canceled builds from `$gl-danger` to `$gl-gray`
      
      ## What are the relevant issue numbers?
      Closes #18074 
      
      ## Screenshots (if relevant)
      <img src="/uploads/f2ac59c5081c31cfb34bdc0470e31384/Screen_Shot_2016-06-01_at_10.38.17_AM.png" width="600px">
      
      See merge request !4412
      402767e0
  2. 07 Jun, 2016 36 commits