features/steps/shared · 71e4175f654a5e6b1e20f03966af49bf9af65f37 · 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
..
active_tab.rb		Loading commit data...
admin.rb		Loading commit data...
authentication.rb		Loading commit data...
builds.rb		Loading commit data...
diff_note.rb		Loading commit data...
group.rb		Loading commit data...
issuable.rb		Loading commit data...
markdown.rb		Loading commit data...
note.rb		Loading commit data...
paths.rb		Loading commit data...
project.rb		Loading commit data...
project_tab.rb		Loading commit data...
search.rb		Loading commit data...
shortcuts.rb		Loading commit data...
sidebar_active_tab.rb		Loading commit data...
snippet.rb		Loading commit data...
user.rb		Loading commit data...