delta/gitlab/gitlab-ce.git/features/steps/shared, branch parallel-diff-alignment

Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline

2016-04-19T18:00:14+00:00

# Conflicts:
#	db/schema.rb

Fixed tests

2016-04-16T20:13:16+00:00

Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline

2016-04-16T17:55:14+00:00

# Conflicts:
#	db/schema.rb

Update click_diff_line

2016-04-14T14:10:40+00:00

Load related MRs/branches asynchronously

2016-04-13T15:24:21+00:00

Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949

Fix rubocop

2016-04-12T10:33:04+00:00

Fix rest of rspec and spinach tests

2016-04-12T08:23:31+00:00

Fix specs

2016-04-11T21:32:55+00:00

Diff design updates

2016-04-07T22:33:18+00:00

Update diff_comments tests

2016-04-07T22:33:18+00:00