Kamil Trzcinski 50076ab974 Merge remote-tracking branch 'origin/master' into per-build-token ... # Conflicts: # db/schema.rb		2016-09-15 13:19:53 +02:00
..
assets	Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into 'master'	2016-09-13 10:51:50 +00:00
controllers	Merge remote-tracking branch 'origin/master' into per-build-token	2016-09-15 13:19:53 +02:00
finders	Use PipelinesFinder in Pipelines API	2016-09-07 15:38:03 +02:00
helpers	Merge remote-tracking branch 'origin/master' into per-build-token	2016-09-15 13:19:53 +02:00
mailers	…
models	Merge remote-tracking branch 'origin/master' into per-build-token	2016-09-15 13:19:53 +02:00
policies	Use `build_read_container_image` and use `build_download_code`	2016-09-15 10:34:53 +02:00
services	Merge remote-tracking branch 'origin/master' into per-build-token	2016-09-15 13:19:53 +02:00
uploaders	…
validators	…
views	Backport search_helper changes from EE	2016-09-14 14:31:02 +03:00
workers	Optimized event pruning query to avoid two queries.	2016-09-07 12:55:25 -07:00