spec/helpers · 5a8f727fd5400634a99eae82e7bac5e26cf36d4e · Forest Godfrey / gitlab-ce

Merge branch 'master' into faster-diffs · 5a8f727f

authored Jul 07, 2016

# Conflicts:
#	app/helpers/notes_helper.rb
#	app/views/projects/diffs/_line.html.haml
#	app/views/projects/diffs/_parallel_view.html.haml
#	app/views/projects/diffs/_text_file.html.haml
#	features/steps/shared/diff_note.rb

5a8f727f

Name	Last commit	Last update
..
application_helper_spec.rb		Loading commit data...
auth_helper_spec.rb		Loading commit data...
blob_helper_spec.rb		Loading commit data...
broadcast_messages_helper_spec.rb		Loading commit data...
ci_status_helper_spec.rb		Loading commit data...
commits_helper_spec.rb		Loading commit data...
diff_helper_spec.rb		Loading commit data...
emails_helper_spec.rb		Loading commit data...
events_helper_spec.rb		Loading commit data...
form_helper_spec.rb		Loading commit data...
gitlab_markdown_helper_spec.rb		Loading commit data...
gitlab_routing_helper_spec.rb		Loading commit data...
graph_helper_spec.rb		Loading commit data...
groups_helper_spec.rb		Loading commit data...
icons_helper_spec.rb		Loading commit data...
import_helper_spec.rb		Loading commit data...
issues_helper_spec.rb		Loading commit data...
labels_helper_spec.rb		Loading commit data...
members_helper_spec.rb		Loading commit data...
merge_requests_helper_spec.rb		Loading commit data...
nav_helper_spec.rb		Loading commit data...
notes_helper_spec.rb		Loading commit data...
notifications_helper_spec.rb		Loading commit data...
page_layout_helper_spec.rb		Loading commit data...
preferences_helper_spec.rb		Loading commit data...
projects_helper_spec.rb		Loading commit data...
runners_helper_spec.rb		Loading commit data...
search_helper_spec.rb		Loading commit data...
submodule_helper_spec.rb		Loading commit data...
tab_helper_spec.rb		Loading commit data...
time_helper_spec.rb		Loading commit data...
tree_helper_spec.rb		Loading commit data...
visibility_level_helper_spec.rb		Loading commit data...