gitlab-org--gitlab-foss/app
Mike Greiling c454dec170 Merge branch 'master' into go-go-gadget-webpack
* 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
  ...
2017-01-28 11:25:15 -06:00
..
assets Merge branch 'master' into go-go-gadget-webpack 2017-01-28 11:25:15 -06:00
controllers Merge branch 'speed-up-members-dropdown' into 'master' 2017-01-27 16:58:22 +00:00
finders Add comments to issuable finder 2017-01-10 20:51:57 -05:00
helpers Merge branch 'master' into go-go-gadget-webpack 2017-01-27 19:33:58 -06:00
mailers Merge branch 'no_project_notes' into 'master' 2017-01-25 11:26:32 +00:00
models update scripts and docs to reference the newly namespaced rake task 2017-01-27 15:23:09 -06:00
policies More improvements to presenters 2017-01-18 16:38:35 +01:00
presenters Don't override presentee methods for Gitlab::View::Presenter::Delegated 2017-01-24 10:24:47 +01:00
serializers Do not generate pipeline ref path if ref not present 2017-01-20 12:44:31 +01:00
services Add a system hook for when a project is updated. 2017-01-26 09:09:14 -05:00
uploaders
validators Whitelist next project names: assets, profile, public 2017-01-06 11:14:17 +02:00
views Merge branch 'master' into go-go-gadget-webpack 2017-01-28 11:25:15 -06:00
workers Fix race conditions for AuthorizedProjectsWorker 2017-01-25 13:22:15 +01:00