1. 03 Feb, 2017 3 commits
    • Lin Jen-Shin's avatar
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into fix-references-header-parsing · 07868944
      Lin Jen-Shin authored
      * upstream/master: (574 commits)
        remove dateFormat global exception
        fix relative paths to xterm.js within fit.js
        use setFixtures instead of fixture.set
        prevent u2f tests from triggering a form submission while testing
        simplify test for focus state
        preload projects.json fixture
        preload projects.json fixture
        rework tests which rely on teaspoon-specific behavior
        Only render hr when user can't archive project.
        use setFixtures instead of fixture.set
        ensure helper classes and constants are exposed globally
        preload projects.json fixture
        fix fixture references in environments_spec
        allow console.xxx in tests, reorder eslint rules alphabetically
        remove redundant "data-toggle" attribute so Vue doesn't complain
        fix broken reference to formatDate in a CommonJS environment
        fix errors within gl_dropdown_spec.js when running in Karma
        fix intermittant errors in merge_commit_message_toggle_spec.rb
        Update installation docs to include Docker, others
        ignore node_modules in rubocop
        ...
      07868944
    • Stan Hu's avatar
      Merge branch 'update-installation-docs' into 'master' · fd46fb1c
      Stan Hu authored
      Update installation docs to include Docker, others
      
      See merge request !8943
      fd46fb1c
  2. 02 Feb, 2017 37 commits