delta/gitlab/gitlab-ce.git/lib/api, branch annotate-models

Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'

2016-05-04T15:27:47+00:00

# Conflicts:
#	Gemfile.lock

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02T23:58:54+00:00

API support for the 'since' and 'until' operators on commit requests

2016-04-29T07:26:52+00:00

- Parameter validation as ISO8601 format

Use ActionDispatch Remote IP for Akismet checking

2016-04-28T05:12:55+00:00

Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.

Closes #16629

Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'

2016-04-26T00:37:01+00:00


Prevent information disclosure via milestone API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579

See merge request !1961

Prevent private snippets in public/internal projects from being leaked via API

2016-04-25T19:02:06+00:00

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580

Filter confidential issues from milestones API if user does not have access

2016-04-25T10:20:29+00:00

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579

Prevent users from deleting Webhooks via API they do not own

2016-04-25T06:53:59+00:00

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576

Merge branch 'ci-commit-as-pipeline' into 'master'

2016-04-21T08:10:37+00:00


Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653

Fix setting of "action" for Grape transactions

2016-04-20T20:42:52+00:00

Merely setting the "action" tag will only result in the transaction
itself containing a value for this tag. To ensure other metrics also
contain this tag we must set the action using Transaction#action=
instead.