1. 14 Oct, 2016 1 commit
    • Rémy Coutable's avatar
      Merge branch 'bug/rst-disable-patch' into 'master' · 7300c3a7
      Rémy Coutable authored
      Use forked github-markup gem
      
      To use the forked version, we must undo some patching we did before.
      
      I'm preserving one patch that changes the interpreter from `python2` to `python3` so that we don't change the required libraries for current source installs. This will let us release the change in a patch release instead of waiting for `8.13`.
      
      Related issue: gitlab-org/gitlab-ce#21696
      
      See merge request !1015
      7300c3a7
  2. 13 Oct, 2016 4 commits
  3. 12 Oct, 2016 1 commit
    • Marin Jankovski's avatar
      Merge branch 'spec_registry_port' into 'master' · aae06755
      Marin Jankovski authored
      Add test for configuration option to change registry's internal port
      
      Related to issue #1433 .
      
      Added two tests for checking whether config files are generated correctly when registry's internal port is explicitly set using configuration option `registry['registry_http_addr']` - one for registry's conf file and one for gitlab-rails's.
      
      See merge request !1027
      aae06755
  4. 11 Oct, 2016 3 commits
  5. 10 Oct, 2016 7 commits
  6. 07 Oct, 2016 7 commits
  7. 06 Oct, 2016 6 commits
  8. 05 Oct, 2016 4 commits
  9. 04 Oct, 2016 2 commits
  10. 03 Oct, 2016 1 commit
  11. 30 Sep, 2016 3 commits
  12. 29 Sep, 2016 1 commit