• Filipa Lacerda's avatar
    Merge branch 'master' into fe-commit-mr-pipelines · 0fe6d5b4
    Filipa Lacerda authored
    * master: (76 commits)
      fix failing test
      fix Vue warnings for missing element
      [ci skip] UX Guide: Button placement in groups
      Change window size before visiting page, to get correct scroll position
      Fix slash commands spec error
      Move project services to new location under Integrations
      Move webhooks to new a location under Integrations
      Fixed redirection from http://someproject.git to http://someproject
      consistently use single quotes
      allow application.js to require other scripts which start with application*
      DRY with Gitlab.config.webpack.dev_server references
      disable webpack proxy in rspec environment due to conflicts with webmock gem
      remove changes to Procfile
      configure webpack dev server port via environment variable
      add rack middleware to proxy webpack dev server
      remove dev-server config from development environment
      Document that the retro and kickoff notes are public
      add CHAGELOG.md entry for webpack branch
      fix failing rspec build
      fix test failure for merge request widget
      ...
    0fe6d5b4
merge_request_tabs.js.es6 10.2 KB