2 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	f4d43ed3b1	Merge branch 'master' into ce-upstream ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/projects/services_controller.rb app/models/concerns/mentionable.rb app/models/project.rb app/models/user.rb app/views/admin/users/index.html.haml app/views/projects/services/_form.html.haml config/gitlab.yml.example config/initializers/1_settings.rb lib/gitlab/git_access.rb lib/gitlab/ldap/access.rb lib/gitlab/ldap/person.rb lib/gitlab/reference_extractor.rb spec/lib/gitlab/ldap/access_spec.rb	2014-10-14 18:23:51 +03:00
Ciro Santilli	fa34901237	Make Spinach test names consistent ... - do not add Feature to feature titles - titleize feature titles - put steps on the same path as .feature files - make feature titles match their path	2014-10-05 18:21:11 +02:00