delta/gitlab/gitlab-ce.git/lib, branch example-java

Merge branch 'rs-issue-13469' into 'master'

2016-02-17T14:19:20+00:00


Handle nil commits in Gitlab::PushDataBuilder.build

Closes #13469

See merge request !2825

Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'

2016-02-16T13:08:36+00:00


Add new data to project in push, issue, merge-request and note webhooks data

_Originally opened at !2738 by @bugagazavr._

- - -

**What does this MR do?**

Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks )

**Are there points in the code the reviewer needs to double check?**

1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738
2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132
3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52
4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56

**Why was this MR needed?**

More information about user for push events, and more data about repositiry ( project )

**What are the relevant issue numbers?**

No

**Screenshots (if relevant)**

No

See merge request !2788

Handle nil commits in Gitlab::PushDataBuilder.build

2016-02-15T21:06:45+00:00

Closes #13469

Fix undefined method `postgresql?` during migration

2016-02-15T19:13:47+00:00

Fix relative links in other markup formats

2016-02-12T16:20:59+00:00

- Apply the RelativeLinkFilter filter to other formats, e.g.,
  reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline

Fixes #3533.

Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master'

2016-02-12T08:39:18+00:00


API: Allow to set or update a merge-request's milestone

_Originally opened at !2107 by @ skakirill._

- - -


See merge request !2755

Load all blob data when highlighting content for git-blame.

2016-02-11T23:30:05+00:00

Merge branch 'remove_sqlite_check' into 'master'

2016-02-11T18:22:14+00:00


Remove sqlite check in raketask

This is a relic from 4 major releases ago. Time to remove it.

See merge request !2777

Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' into 'master'

2016-02-11T17:13:36+00:00


Add merge_requests/:merge_request_id/closes_issues

_Originally opened at !2660 by @Schniz._

- - -

Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully

See merge request !2779

Add new data to project in push, issue, merge-request and note webhooks data

2016-02-11T16:22:11+00:00

- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
  `path_with_namespace` and `default_branch` in `project` in push, issue,
  merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
  favor of `git_http_url` in `project` for push, issue, merge-request and
  note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
  note webhooks data, use `project` instead