delta/gitlab/gitlab-ce.git/lib, branch bump_gitlab_shell

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-08-03T09:04:04+00:00

Merge branch 'api-useremails' into 'master'

2015-07-31T20:40:51+00:00


Add ability to manage user email addresses via the API.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181

See merge request !1066

Fix indentation

2015-07-31T20:39:51+00:00

Merge branch 'master' into api-useremails

2015-07-31T12:34:53+00:00

Fix multi-line syntax highlighting

2015-07-31T05:37:53+00:00

HTML span elements only apply to a single line, and in the case of multi-line
comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

Closes #1577

Merge branch 'rs-mr-1050-followup' into 'master'

2015-07-31T01:47:41+00:00


Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078

Merge branch 'api-new-attributes' into 'master'

2015-07-30T21:38:48+00:00


Add project star and fork count, group avatar URL and user/group web URL attributes to API

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521.

See merge request !1058

Add spec to RelativeLinkFilter for Unicode filenames

2015-07-30T21:25:07+00:00

Merge branch 'fix-image-file-is-not-displayed' into 'master'

2015-07-30T21:24:13+00:00

Update RelativeLinkFilter to support non-ASCII filenames

See merge request !1050

Merge branch 'backup-directory-permissions' into 'master'

2015-07-30T14:11:41+00:00


Backup directory permissions

This sidesteps problems with running 'chmod' on some CIFS mounts.

Closes #1704 
https://gitlab.com/gitlab-org/gitlab-ce/issues/1704

See merge request !1065