• Mike Greiling's avatar
    Merge branch 'master' into go-go-gadget-webpack · c454dec1
    Mike Greiling authored
    * master: (33 commits)
      Improved code style on the issue_sidebar_spec.rb
      add CHAGELOG.md entry for !8831
      remove assets:compile step from relative_url docs
      update scripts and docs to reference the newly namespaced rake task
      namespace assets rake tasks to gitlab:assets:*
      correct gzip files if they exist as well
      automatically correct CSS urls on assets:precompile
      remove hard-coded assets path for ace editor modules
      Fixed cancel button in the services form not redirecting back to the integrations settings view
      Fix search bar search param encoding
      Fix a transient failure in the `Explore::ProjectsController` spec
      Fix filtering with multiple words
      Fix project name label's for reference in project settings
      Fixed merge request tabs extra margin
      Don't call `#uniq` on a relation
      Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
      Move ApplicationSetting DEFAULTS to `.defaults` instead
      Move a begin/rescue clause to ApplicationSetting.expire
      Use badge partial as single source of truth instead of having 2 partials doing the same
      Changes after review
      ...
    c454dec1
This project manages its dependencies using Bundler. Learn more
Gemfile.lock 24.8 KB