Luke "Jared" Bennett 12fbce2eac Merge branch 'master' into 'add-sentry-js-again-with-vue' ... # Conflicts: # db/schema.rb		2017-05-04 22:48:21 +00:00
..
assets	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-05-04 22:48:21 +00:00
controllers	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-05-04 22:48:21 +00:00
finders	Add constant as ALLOWED_INDEXED_COLUMNS	2017-05-03 02:11:51 +09:00
helpers	Merge branch 'dm-artifact-blob-viewer' into 'master'	2017-05-04 15:01:54 +00:00
mailers	Rename GitlabMarkdownHelper -> MarkupHelper	2017-04-27 13:22:17 +02:00
models	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-05-04 22:48:21 +00:00
policies	Support uploaders for personal snippets comments	2017-05-02 15:22:24 +02:00
presenters	Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load-async	2017-04-27 16:40:27 -04:00
serializers	Merge branch 'deploy-keys-load-async' into 'master'	2017-05-04 18:30:41 +00:00
services	Merge branch '12910-uploader-pers-snippet' into 'master'	2017-05-04 10:47:10 +00:00
uploaders	Support uploaders for personal snippets comments	2017-05-02 15:22:24 +02:00
validators	Reject EE reserved namespace paths in CE as well	2017-05-04 18:11:31 +02:00
views	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-05-04 22:48:21 +00:00
workers	Update Carrierwave and fog-core	2017-05-01 20:15:16 +00:00