1. 12 Feb, 2018 6 commits
    • Filipa Lacerda's avatar
      [ci skip] Merge branch 'master' into 42923-close-issue · ab734240
      Filipa Lacerda authored
      * master: (21 commits)
        GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP)
        Return a warning string if we try to encode to unsupported encoding
        Remove confirmation_input
        Resolve failures in GitHub-ish import controller specs
        Remove changelogs for already-released security patches
        Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'
        Merge branch 'fix/gh-namespace-issue' into 'security-10-4'
        Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4'
        Merge branch 'fix-mermaid-xss' into 'security-10-4'
        Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'
        API - fix searching in group/project specified by path
        Add documentation on how to build a QA Docker image
        Fix english in style_guide_js.md
        Adds tooltip for environment name Adds CSS for child envrionments
        Do not attach runner to a non-exsiting network in QA
        Remove not needed default statement
        Improve docs about allowing some side effects on the constructor
        Move all ENV to Runtime::Env
        Rename .scss files to use snake_case
        Moves missing branch into a vue file
        ...
      ab734240
    • Grzegorz Bizon's avatar
      Merge branch 'sh-add-login-types-qa' into 'master' · cc68b0df
      Grzegorz Bizon authored
      GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP)
      
      See merge request gitlab-org/gitlab-ce!17048
      cc68b0df
    • Phil Hughes's avatar
      Merge branch '42922-environment-name' into 'master' · 3d153622
      Phil Hughes authored
      Resolve "Add tooltip in enviroments names"
      
      Closes #42922
      
      See merge request gitlab-org/gitlab-ce!17029
      3d153622
    • Filipa Lacerda's avatar
      Put back class names used in shared test · 853c80a9
      Filipa Lacerda authored
      853c80a9
    • Filipa Lacerda's avatar
      Merge branch '42908-rename-scss-files-to-use-snake-case' into 'master' · 595bc740
      Filipa Lacerda authored
      Rename .scss files to use snake_case
      
      Closes #42908
      
      See merge request gitlab-org/gitlab-ce!17022
      595bc740
    • Grzegorz Bizon's avatar
      Merge branch '42937-search-api-fix' into 'master' · a1503cae
      Grzegorz Bizon authored
      API - fix searching in group/project specified by path
      
      Closes #42937
      
      See merge request gitlab-org/gitlab-ce!17033
      a1503cae
  2. 11 Feb, 2018 1 commit
  3. 09 Feb, 2018 33 commits