Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions ... # Conflicts: # db/schema.rb		2016-02-05 20:15:32 +01:00
..
admin
atom
issues
merge_requests
profiles
security
builds_spec.rb
ci_lint_spec.rb
commits_spec.rb
gitlab_flavored_markdown_spec.rb
groups_spec.rb
help_pages_spec.rb
issues_spec.rb
login_spec.rb
markdown_spec.rb
notes_on_merge_requests_spec.rb
password_reset_spec.rb
profile_spec.rb
projects_spec.rb
runners_spec.rb
search_spec.rb
task_lists_spec.rb
triggers_spec.rb
users_spec.rb
variables_spec.rb