delta/gitlab/gitlab-ce.git/spec, branch bump_gitlab_shell gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-03T09:04:04+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2015-08-03T09:04:04+00:00 b118f648cb393d9ef4e1e510e86b72cb3e8c98f3 






Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-02T19:53:08+00:00

Stan Hu
stanhu@gmail.com

2015-08-02T19:53:08+00:00

b8433cb886abfdc7eae86c1789c0f1c5ff56204d












Re-annotate models
2015-08-02T16:52:54+00:00

Atsushi Ishida
gipcompany@gmail.com

2015-08-02T16:52:54+00:00

f33898ecfb7c5c15c8a3355dabe07cdff296fc75












Merge branch 'api-useremails' into 'master'

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

Robert Speicher
robert@gitlab.com

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

3f84c8a680e45f60d2d1b7befc2fb151205df96c


Add ability to manage user email addresses via the API.

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

See merge request !1066





Add ability to manage user email addresses via the API.

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

See merge request !1066






Merge branch 'master' into api-useremails
2015-07-31T12:34:53+00:00

Douwe Maan
douwe@gitlab.com

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

51e5f379dd69837d3405c78e5ef6ce3727939f3c












Fix multi-line syntax highlighting
2015-07-31T05:37:53+00:00

Stan Hu
stanhu@gmail.com

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

0abe98f0497b667ef85ad4e078ea5c10b5b26ede

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





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

Robert Speicher
robert@gitlab.com

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

a51a3fb8ed92a58b375125b19f75c3d4c545571a


Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078





Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078






Merge branch 'rs-markdown-feature-pipelines' into 'master'

2015-07-31T01:35:02+00:00

Robert Speicher
robert@gitlab.com

2015-07-31T01:35:02+00:00

327013ace9933eaec75c7e41f5918a311e861d12


Prepare Markdown feature spec for testing multiple pipelines

This MR lays the groundwork for including or excluding certain HTML::Pipeline
filters depending on what we're parsing. For example, excluding reference
filters in the Issues and Merge Requests titles.

See merge request !1053





Prepare Markdown feature spec for testing multiple pipelines

This MR lays the groundwork for including or excluding certain HTML::Pipeline
filters depending on what we're parsing. For example, excluding reference
filters in the Issues and Merge Requests titles.

See merge request !1053






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

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

Robert Speicher
robert@gitlab.com

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

a876db48d95588837895e83e92d0cf3f8a129d02


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 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

Robert Speicher
rspeicher@gmail.com

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

4e22dcb6a34f43e5b3b2700ec72b32354315adc0