delta/gitlab/gitlab-ce.git/spec/helpers, branch fix-include-description-commit-message

Merge branch '24915_merge_slash_command' into 'master'

2017-01-19T09:40:45+00:00


Support `/merge` slash command for MRs

Closes #24915

See merge request !7746

Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into 'master'

2017-01-03T18:37:28+00:00


Disable award emoji button but display tooltip

Closes #26168

See merge request !8382

Fix cross-project references copy to include the project reference

2017-01-03T12:01:46+00:00

Also added relevant specs and refactored to_references in a bunch of places to be more consistent.

Disable award emoji button but display tooltip

2016-12-31T12:35:05+00:00

Add more storage statistics

2016-12-21T15:39:49+00:00

This adds counters for build artifacts and LFS objects, and moves
the preexisting repository_size and commit_count from the projects
table into a new project_statistics table.

The counters are displayed in the administration area for projects
and groups, and also available through the API for admins (on */all)
and normal users (on */owned)

The statistics are updated through ProjectCacheWorker, which can now
do more granular updates with the new :statistics argument.

Reduce duplication for GitHubish import status view

2016-12-19T16:35:51+00:00

Signed-off-by: Rémy Coutable

Always use `fixture_file_upload` helper to upload files in tests.

2016-12-19T01:35:07+00:00

* Also is not a good idea to use File.open without closing the file
  handler. We should use it with a block or close it explicitly.

Add Gitlab::Middleware::Multipart

2016-12-15T11:26:36+00:00

Merge branch 'html-safe-diff-line-content' into 'security'

2016-12-09T00:38:35+00:00


Don't accidentally mark unsafe diff lines as HTML safe

Fixes potential XSS issue when a legacy diff note is created on a merge
request whose diff contained HTML

See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249

See merge request !2040

Add shorthand support to gitlab markdown references

2016-12-02T21:18:17+00:00