gitlab-org--gitlab-foss/spec
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
..
bin
config Use newer mail_room to get `require_relative` support 2017-02-20 17:38:21 +01:00
controllers Merge branch 'issue_24815' into 'master' 2017-02-27 14:14:20 +00:00
db/production
factories Merge branch 'dm-fix-web-edit-new-lines' into 'master' 2017-02-24 21:57:47 +00:00
features Merge branch 'ssh-key-paste' into 'master' 2017-02-27 16:45:46 +00:00
finders Revert "Enable Style/DotPosition" 2017-02-23 09:33:19 -06:00
fixtures Use newer mail_room to get `require_relative` support 2017-02-20 17:38:21 +01:00
helpers Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
initializers Enable Style/SpaceInsideBrackets 2017-02-23 09:31:56 -06:00
javascripts Remove unused test 2017-02-25 21:35:10 +00:00
lib Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' 2017-02-25 19:58:05 +00:00
mailers Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
migrations Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
models Merge branch '1937-https-clone-url-username' into 'master' 2017-02-27 12:21:04 +00:00
policies Don't allow deleting a ghost user. 2017-02-24 16:50:20 +05:30
presenters/ci Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
requests Merge branch 'unified-member-api-response' into 'master' 2017-02-27 11:51:05 +00:00
routing
rubocop/cop
serializers Revert "Enable Style/DotPosition" 2017-02-23 09:33:19 -06:00
services Include nested group into destroy_service_spec 2017-02-27 14:28:02 +02:00
support Merge branch 'issue_24815' into 'master' 2017-02-27 14:14:20 +00:00
tasks Revert "Enable Style/DotPosition" 2017-02-23 09:33:19 -06:00
uploaders
views Revert "Enable Style/DotPosition" 2017-02-23 09:33:19 -06:00
workers Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb