delta/gitlab/gitlab-ce.git, branch fix/commit-status-artifacts

Update commit status factory to reflect recent changes

2016-01-26T14:23:57+00:00

Add Changelog entry for undefined method fix in commit builds

2016-01-26T07:36:54+00:00

Add specs for build created using generic commit status

2016-01-26T07:34:48+00:00

Use generic method to checks if artifacts are available

2016-01-26T07:34:48+00:00

Merge branch 'patch-1' into 'master'

2016-01-26T05:12:45+00:00


Update Slack integration configuration

Adjusted to the current Slack version (as of I 2016).

See merge request !2595

Update CHANGELOG

2016-01-26T04:59:24+00:00

[ci skip]

Merge branch 'fix-import-redirect-loop' into 'master'

2016-01-26T00:48:56+00:00


Fix import redirect loop

Fixes #11864 

See merge request !2606

Merge branch 'instrumentation-signature' into 'master'

2016-01-26T00:04:09+00:00


Correct arity for instrumented methods w/o args

This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes.

See merge request !2602

Merge branch 'note-highlighting' into 'master'

2016-01-25T23:43:44+00:00


Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594

Merge branch 'rs-rails-security' into 'master'

2016-01-25T23:22:24+00:00


Update rails, rails-html-sanitizer, and nokogiri for security fixes

See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643

See merge request !2603