1. 27 Jun, 2016 2 commits
    • Rémy Coutable's avatar
      Merge branch 'refactor/ci-config-add-entry-error' into 'master' · a9dbd394
      Rémy Coutable authored
      Improve validations and error handling in new CI config entries
      
      ## What does this MR do?
      
      This MR improves validation in new CI config.
      
      ## Why was this MR needed?
      
      With that it will be easier to handle errors during validation and post-processing.
      
      ## What are the relevant issue numbers?
      
      This is a continuation of #15060
      
      See merge request !4560
      a9dbd394
    • Rémy Coutable's avatar
      Merge branch 'remove-unused-templates-from-gitlab-ci' into 'master' · 030db5c3
      Rémy Coutable authored
      Clean up some unused templates imported from GitLab CI
      
      ## What does this MR do?
      
      Clean up some unused templates imported from GitLab CI, for new developers to easily understand the file/directory structure of Gitlab CE.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Be sure if removed files are not used now while the committer checked them once.
      
      ## Why was this MR needed?
      
      Because the file/directory structure of the repository should be clear and simple and if so new developers can easily understand the file/directory structure of Gitlab CE.
      
      ## What are the relevant issue numbers?
      
      Closes #19158 
      
      ## Does this MR meet the acceptance criteria?
      
      - CHANGELOG won't be updated due to repository maintenance
      - No documentation created/updated
      - No API support added
      - Tests
        - [skipped] Added for this feature/bug
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4922
      030db5c3
  2. 26 Jun, 2016 5 commits
  3. 25 Jun, 2016 1 commit
  4. 24 Jun, 2016 28 commits
  5. 23 Jun, 2016 4 commits
    • Robert Speicher's avatar
      Merge branch 'hamlit-test' into 'master' · 9e43fc15
      Robert Speicher authored
      Replace Haml with Hamlit
      
      What this change does:
      - It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML.
      - It removes `haml-rails`.
      - It adds `hamlit.rb` and removes `haml.rb`.
      - It makes things faster and less memory-hungry!
      
      See also #13201.
      
      See merge request !3666
      9e43fc15
    • Douwe Maan's avatar
      Merge branch 'zj-pipeline-can-be-nil' · 951b0a1a
      Douwe Maan authored
      951b0a1a
    • Jacob Schatz's avatar
      Merge branch 'fix-logo' into 'master' · 214137aa
      Jacob Schatz authored
      Remove width restriction for logo on sign-in page.
      
      Follow-up on !4661 since we didn't remove the width restriction on that.
      
      See merge request !4888
      214137aa
    • Jacob Schatz's avatar
      Merge branch '18438-ios-scrolling' into 'master' · 1f472c72
      Jacob Schatz authored
      Resolve "Scrolling horz on iOS for the secondary nav is broken"
      
      ## What does this MR do?
      Moves absolutely positioned `div`s outside of the scrolling container because mobile safari causes those elements to jump around on scroll.
      
      ## Are there points in the code the reviewer needs to double check?
      Check on a real iPhone (was only able to check in iOS simulator)
      
      ## Why was this MR needed?
      Mobile Safari.
      
      ## What are the relevant issue numbers?
      Closes #18438 
      
      ## Screenshots (if relevant)
      ![mobile-safari-fix](/uploads/b38bba735530eb11507fe03036292dd8/mobile-safari-fix.gif)
      
      See merge request !4869
      1f472c72