delta/gitlab/gitlab-ce.git/app/models, branch image-diff

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

Use project.web_url instead deprecated repository.homepage in PushoverService

2016-02-16T12:03:00+00:00

Cleaned up Repository#initialize

2016-02-16T11:13:13+00:00

The "default_branch" argument is never used and the "project" argument
isn't optional.

Merge branch 'fix_500-commit-null' into 'master'

2016-02-12T17:40:40+00:00


Don't try to mark broken MR as mergable

In case merge request is broken, we shouldn't check if the sha
is mergable, as it will be null, and there's no point, as we know
that it's not mergable.

See merge request !2783

Merge branch 'streamline-email-validation' into 'master'

2016-02-12T09:09:23+00:00


Validate email addresses using Devise.email_regexp

Also:
- Get rid of legacy `:strict_mode`
- Get rid of custom `:email` validator
- Add some shared examples to spec emails validation

This supersedes !2754 and fixes #3851.

See merge request !2771

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

Don't try to mark broken MR as mergable

2016-02-10T23:38:07+00:00

In case merge request is broken, we shouldn't check if the sha
is mergable, as it will be null, and there's no point, as we know
that it's not mergable.

Merge branch 'display-mr-link-if-thre-is-one' into 'master'

2016-02-10T21:53:41+00:00


Replaces "Create merge request" link with one to the MR when one exists

Fixes #3716

* Without MR:

![before-1](/uploads/abcb2eb5bb5927a83c2f1700528f852c/before-1.png)

* With MR:

![after-1](/uploads/9020b871e1aa08d3e5a45359336ef0f2/after-1.png)

* Without MR:

![before-2](/uploads/bb3bd1a74efc193ad31af68f1e04ef5f/before-2.png)

* With MR:

![after-2](/uploads/789d32aef12f39c605e665d0c4bc9fbe/after-2.png)

* Without MR:

![before-3](/uploads/a9aff7a11eb1069be24c37a5455be809/before-3.png)

* With MR:

![after-3](/uploads/48fe81ea50657fe5b2de0d25260d8e4b/after-3.png)

See merge request !2670

Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into 'master'

2016-02-10T21:26:01+00:00


Add assignee data to Issuables' hook_data

Originally opened at !1633 by @brammeleman.

Fixes #3047. Fixes #2475.

See merge request !2724

Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master'

2016-02-10T19:01:44+00:00


Actually use the `skip_merges` option in Repository#commits

Originally opened at !2067 by @cwq1913.

See merge request !2750