delta/gitlab/gitlab-ce.git/features, branch parallel-diff-alignment gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'top-navigation-concept' into 'master' 2016-04-21T11:48:28+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-04-21T11:48:28+00:00 f4859b93a5731a5f69340aed26ff7cf91424abdf Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824 

Implement top navigation for profile area

Main idea is to keep left sidebar static so user is not confused by
changing context. Instead we put changing navigation with changing
content in one main block. I used profile area as a simplest way to 
implement and test this concept. Your feedback is welcome in comments

For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3824
 Merge branch 'ci-commit-as-pipeline' into 'master' 2016-04-21T08:10:37+00:00 Kamil Trzciński ayufan@ayufan.eu 2016-04-21T08:10:37+00:00 d2406668003f610139b60c036bc6fd9be982a580 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 

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
 Merge branch 'multi-filter-labels' into 'master' 2016-04-20T19:18:32+00:00 Jacob Schatz jschatz@gitlab.com 2016-04-20T19:18:32+00:00 692c35e6f499598d0c6f91eb83ca8837ca93e07f Mutliple label filter Fixes #989 See merge request !3438 

Mutliple label filter

Fixes #989 

See merge request !3438
 Merge branch 'license-templates-and-api-12804' into 'master' 2016-04-20T01:38:49+00:00 Robert Speicher robert@gitlab.com 2016-04-20T01:38:49+00:00 3d4875f86a3b23789f5ea801c096754fced25166 License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660 

License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 Fix tests and remove counters 2016-04-19T19:11:33+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-04-19T19:11:33+00:00 52268d1d9a7c64886dcc99a1a82c02af1ccbe7a1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 2016-04-19T18:00:14+00:00 Kamil Trzcinski ayufan@ayufan.eu 2016-04-19T18:00:14+00:00 27e0c7723ca1eb85222210a20fd3fee1d77733f7 # Conflicts: # db/schema.rb 
# Conflicts:
#	db/schema.rb
Merge branch 'mr-formatting' into 'master' 2016-04-19T16:23:41+00:00 Robert Speicher robert@gitlab.com 2016-04-19T16:23:41+00:00 7b09bab68e0ccc4990218ee91211577d4d109703 use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740 

use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740
 format merge request references properly 2016-04-19T06:32:02+00:00 Ben Bodenmiller bbodenmiller@hotmail.com 2016-04-19T06:32:02+00:00 b68e3925ffac4e8ffa376e25786c5dcaa915d75a 






Fix specs
2016-04-18T12:47:50+00:00

Rémy Coutable
remy@rymai.me

2016-04-13T15:00:22+00:00

b2370fefad16b6b0a808a75b9a7b1d1613187693

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Fix features specs (hopefully)
2016-04-18T12:47:50+00:00

Rémy Coutable
remy@rymai.me

2016-04-12T14:56:18+00:00

0aaaae9d0536c5637662f6c72a6612ec13f0342f

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>