Filipa Lacerda 61f65992a0 Merge branch 'master' into 'add-svg-loader' ... # Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6		2017-02-27 17:10:25 +00:00
..
assets	Merge branch 'master' into 'add-svg-loader'	2017-02-27 17:10:25 +00:00
controllers	Merge branch 'mock-ci-service' into 'master'	2017-02-27 16:43:05 +00:00
finders	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00
helpers	Merge branch '1937-https-clone-url-username' into 'master'	2017-02-27 12:21:04 +00:00
mailers	Fix code for cops	2017-02-23 09:31:57 -06:00
models	Merge branch 'mock-ci-service' into 'master'	2017-02-27 16:43:05 +00:00
policies	Don't allow deleting a ghost user.	2017-02-24 16:50:20 +05:30
presenters	Don't override presentee methods for Gitlab::View::Presenter::Delegated	2017-01-24 10:24:47 +01:00
serializers	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00
services	Make nested groups deletion synchronous to avoid potential race	2017-02-27 13:09:55 +02:00
uploaders	Enable Style/MutableConstant	2017-02-23 09:31:56 -06:00
validators	Introduce DurationValidator, feedback:	2017-02-24 17:28:24 +08:00
views	Merge branch 'master' into 'add-svg-loader'	2017-02-27 17:10:25 +00:00
workers	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00