delta/gitlab/gitlab-ce.git/spec/models, branch parallel-diff-alignment

Merge branch 'fix/label-filters' into 'master'

2016-04-21T13:13:10+00:00


Filter labels by including ALL filter titles

Fixed query to use `AND` and not `OR`. Refactored relevant specs

See merge request !3815

refactored specs based on feedback

2016-04-21T11:20:00+00:00

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

refactored specs, adding more scenarios

2016-04-21T07:12:03+00:00

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters

2016-04-21T06:37:38+00:00

# Conflicts:
#	spec/features/issues/filter_by_labels_spec.rb

final line missing

2016-04-20T09:50:07+00:00

fix rubocop warning

2016-04-20T09:25:33+00:00

udpated a few things based on MR feedback. Also added model spec

2016-04-20T08:56:28+00:00

Merge branch 'slack_wiki_notifications' into 'master'

2016-04-20T08:12:48+00:00


add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

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

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998

Merge branch 'license-templates-and-api-12804' into 'master'

2016-04-20T01:38:49+00:00


License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660