delta/gitlab/gitlab-ce.git/app/models/project_services, branch diff-parse-first-commit

Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'

2016-01-13T14:21:32+00:00


Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;

https://github.com/gitlabhq/gitlabhq/pull/9964

@DouweM

See merge request !2383

Mention channel/key bug in irkerd docs

2016-01-12T22:54:09+00:00

Per this issue: https://gitlab.com/esr/irker/issues/2

A documentation update was added to irkerd (https://gitlab.com/esr/irker/commit/190808c37d4ab5f0f16fe35352ff36863c2732d5) but the bug is still there. Making a note of it here could save someone a lot of hassle. 

This could probably be worded better if someone else wants to take a stab at it.

Use CGI.escape instead of URI.escape, because URI is obsoleted.

2016-01-12T10:20:03+00:00

ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc

Merge branch 'fix_jira_shortterm' into 'master'

2016-01-10T22:12:10+00:00


Do not call API if there is no API URL

Fixes #5878 

CE users may not be interested in the new JIRA features. In this case,
we should detect they haven't set an API URL and fallback to the
behavior pre-8.3. This patch does that very easily.

There are planned improvements to JIRA in future releases such as
gitlab-org/gitlab-ce#5541 which will make this more configurable.

See merge request !2341

Merge branch 'suppress-allow-failure-builds' into 'master'

2016-01-08T17:31:35+00:00


Suppress e-mails on failed builds if allow_failure is set

Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`.

@ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away.

See merge request !2178

Remove useless assignment to variable

2016-01-08T14:22:42+00:00

Remove reference to EE from JIRA service model

2016-01-08T12:21:40+00:00

Do not call API if there is no API URL

2016-01-07T22:23:42+00:00

Suppress e-mails on failed builds if allow_failure is set

2016-01-07T18:45:39+00:00

Every time I push to GitLab, I get > 2 emails saying a spec failed when
I don't care about benchmarks and other specs that have `allow_failure` set to `true`.

Annotate models

2016-01-06T13:09:55+00:00