1. 16 Mar, 2016 7 commits
    • Yorick Peterse's avatar
      Added an index on ci_runners.token · af4d5458
      Yorick Peterse authored
      On PostgreSQL the index is created concurrently.
      
      Fixes gitlab-org/gitlab-ce#14325
      af4d5458
    • Achilleas Pipinellis's avatar
      Merge branch 'doc-updates' into 'master' · a34021cd
      Achilleas Pipinellis authored
      Fix requirements.md link and improve PostgreSQL commands
      
       - Point requirements.md link to the correct location
      
       - Link to gitlab installation.md document instead of github
      
       - Use psql command switch to run specified SQL commands for creation of user and database permissions.
          -  Instead of requiring a comment like `# Do not type the 'template1=#', this is part of the prompt` it may be easier to just use the command switch with `psql` to execute the SQL commands.
      
      
      *forgot [ci skip] :(*
      
      See merge request !3176
      a34021cd
    • Robert Speicher's avatar
      Merge branch 'issue_14306' into 'master' · 374037b8
      Robert Speicher authored
      Return an empty Array when there aren't lines to parse.
      
      Fixes #14306
      
      See merge request !3243
      374037b8
    • Douwe Maan's avatar
      Merge branch 'support-utf8-wiki-page-title' into 'master' · c9c14584
      Douwe Maan authored
      Support Wiki with UTF-8 page name
      
      ## What does this MR do?
      
      Support Wiki with UTF-8 page name.
      
      See https://github.com/gollum/gollum/pull/929
      
      ## Why was this MR needed?
      
      Relax constraints for wiki slug in aac65984.
      
      It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error.
      
      Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project.
      
      ## Workaround
      
      1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone
      2. Clone the wiki repo
      3. Find the page with UTF-8 name
      4. Rename or Delete these files
      5. Commit and push
      
      ## What are the relevant issue numbers?
      
      - #13979
      - #13891
      - #13698
      - #13603
      - #13317
      - #12906
      - #12825
      - #10945 
      
      ## Todo
      
      - [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release
      
      'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version),
      but 'gitlab_git' gem depends on rugged v0.24.0b13.
      
      So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now.
      
      
      See merge request !2999
      c9c14584
    • Douwe Maan's avatar
      Merge branch 'worker-for-user-deletion' into 'master' · f83a596d
      Douwe Maan authored
      A worker deletes a user, so the request doesn't time out
      
      Fixes #13261
      
      
      See merge request !2855
      f83a596d
    • Rubén Dávila's avatar
      7e03b402
    • Robert Speicher's avatar
      Merge branch 'fix-capybara-deprecation-warnings' into 'master' · 64d0dd18
      Robert Speicher authored
      Fix Capybara 2.6.2 deprecation warnings
      
      See merge request !3236
      64d0dd18
  2. 15 Mar, 2016 33 commits