delta/gitlab/gitlab-ce.git/app/models, branch test-old-codeclimate

Add issue sidebar and toggle_subscription endpoint in board issues data

2017-11-20T14:38:53+00:00

Merge branch '38393-Milestone-duration-error-message-is-not-accurate-enough' into 'master'

2017-11-20T11:34:07+00:00

Changed validation error message on wrong milestone dates

Closes #38393

See merge request gitlab-org/gitlab-ce!15471

Merge branch 'fix-conflict-highlighting' into 'master'

2017-11-20T10:17:43+00:00

Fix conflict highlighting

See merge request gitlab-org/gitlab-ce!15463

Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'

2017-11-20T09:22:14+00:00

Adds Rubocop rule for line break after guard clause

Closes #18040

See merge request gitlab-org/gitlab-ce!15188

Changed validation error message on wrong milestone dates

2017-11-18T18:30:32+00:00

Fix conflict highlighting

2017-11-17T17:57:48+00:00

Conflicts used to take a `Repository` and pass that to
`Gitlab::Highlight.highlight`, which would call `#gitattribute` on the
repository. Now they use a `Gitlab::Git::Repository`, which didn't have that
method defined - but defining it on `Gitlab::Git::Repository` does make it
available on `Repository` through `method_missing`, so we can do that and both
cases will work.

Merge branch 'mk-add-user-rate-limits' into 'master'

2017-11-17T16:11:22+00:00

Add request rate limits

Closes #30053

See merge request gitlab-org/gitlab-ce!14708

Changing OAuth lookup to be case insensitive

2017-11-17T14:24:25+00:00

Merge branch 'bvl-delete-empty-fork-networks' into 'master'

2017-11-17T14:21:36+00:00

Delete empty fork networks

See merge request gitlab-org/gitlab-ce!15373

Merge branch 'ci-pipeline-status-query' into 'master'

2017-11-17T12:56:12+00:00

Optimise getting the pipeline status of commits

See merge request gitlab-org/gitlab-ce!15332