• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file · 406dfd6e
    Lin Jen-Shin authored
    * upstream/master:
      Ensure we have a project with a repo in GitlabMarkdownHelper specs
      Revert "Make sure TraceReader uses Encoding.default_external"
      Make sure TraceReader uses Encoding.default_external
      Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip]
      Use `:empty_project` where possible in finder specs
      Use `empty_project` where possible in controller specs
      Use `:empty_project` where possible in helper specs
      Don’t count tasks that are not defined as list items correctly
      Use a project factory with a repository where necessary
      Use `:empty_project` where possible throughout spec/lib
      Use hashrocket for dasherized attribute
      Remove markdown file extension and add anchor to link
      Fixed builds info link on project settings page
      Factories with a project association use `:empty_project` by default
      Update enviroments.md the example for deleting an environment is missing the "s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1"  wil 404
    406dfd6e
merge_request_template_spec.rb 2.65 KB