1. 23 Oct, 2017 6 commits
    • Filipa Lacerda's avatar
      Merge branch 'master' into 37860-pipelines-page · 4ad8c999
      Filipa Lacerda authored
      * master: (88 commits)
        Fix deletion of container registry or images returning an error
        The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
        Decrease ABC threshold to 54.28
        Update VERSION to 10.2.0-pre
        Update CHANGELOG.md for 10.1.0
        Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
        Fix the external URLs generated for online view of HTML artifacts
        Use title as placeholder instead of issue title for reusability
        Fix failure in current_settings_spec.rb
        Clarify the difference between project_update and project_rename
        URI decode Page-Title header to preserve UTF-8 characters
        Update Gitaly version to v0.49.0
        Decrease Perceived Complexity threshold to 14
        Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
        Force non diff resolved discussion to display when collapse toggled
        Added submodule support in multi-file editor
        add note about after_script being run separately
        Check for element before evaluate_script
        Merge branch 'master-i18n' into 'master'
        Update Prometheus gem to fix problems with other files overwriting current file
        ...
      4ad8c999
    • Phil Hughes's avatar
      Merge branch '38869-diff' into 'master' · c1ed00e8
      Phil Hughes authored
      Remove Diff class from global namespace
      
      See merge request gitlab-org/gitlab-ce!14965
      c1ed00e8
    • Sean McGivern's avatar
      Merge branch '39308-fix-broken-master' into 'master' · 5d74973d
      Sean McGivern authored
      Fix the broken .tests-metadata-state definition
      
      Closes #39308
      
      See merge request gitlab-org/gitlab-ce!14969
      5d74973d
    • Filipa Lacerda's avatar
      Merge branch 'sh-fix-container-registry-destroy' into 'master' · 4cc91b4f
      Filipa Lacerda authored
      Fix deletion of container registry or images returning an error
      
      Closes #39354
      
      See merge request gitlab-org/gitlab-ce!14992
      4cc91b4f
    • Stan Hu's avatar
      Merge branch 'fix-fog-aliyun-39126' into 'master' · c4cbf115
      Stan Hu authored
      The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This…
      
      Closes #39126
      
      See merge request gitlab-org/gitlab-ce!14991
      c4cbf115
    • Stan Hu's avatar
      Fix deletion of container registry or images returning an error · 3e81c500
      Stan Hu authored
      A successful DELETE call would result in a 204 No Content result,
      which would have an empty response body. Don't automatically try
      to parse this value as JSON both because there is no additional
      information passed in the response body.
      
      Closes #39354
      3e81c500
  2. 22 Oct, 2017 4 commits
  3. 21 Oct, 2017 30 commits