delta/gitlab/gitlab-ce.git/app/controllers/projects, branch rename-ci-commit-phase-3 gitlab.com: gitlab-org/gitlab-ce.git Rename @ci_commit to @pipeline in MergeRequestController 2016-06-07T11:19:15+00:00 Kamil Trzcinski ayufan@ayufan.eu 2016-06-07T11:19:15+00:00 b0eb4cb4a73d78b45cc86b3714d7493484b2b5e7 






Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3
2016-06-06T18:24:30+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T18:24:30+00:00

1311f8c2c15f417c944e5d1113f7f20290c85ca3












Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2
2016-06-06T18:24:21+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T18:24:21+00:00

4e38d88df50d85d076110c8b78aaac78772d9554












Merge branch 'notes-are-awardables' into 'master'

2016-06-06T16:48:35+00:00

Douwe Maan
douwe@gitlab.com

2016-06-06T16:48:35+00:00

4d4a9b7c8a62b720e573a2bec67407acc455531a


Notes are awardables

## What does this MR do?

Makes sure we can :thunder_cloud_rain: comments/notes.

## What are the relevant issue numbers?
Follows up upon !2901, depends on !3785

Closes #3655 

## Screenshots (if relevant)
TODO



See merge request !4291





Notes are awardables

## What does this MR do?

Makes sure we can :thunder_cloud_rain: comments/notes.

## What are the relevant issue numbers?
Follows up upon !2901, depends on !3785

Closes #3655 

## Screenshots (if relevant)
TODO



See merge request !4291






Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3
2016-06-06T14:46:44+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T14:46:44+00:00

ef35ca238dd8ed1c8b8d8c3cfdf64630c6c781ff












Use `@ci_commit` in merge_request_controller
2016-06-06T14:46:18+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T14:46:18+00:00

13d4231eb9f577456b420ff5044c55584add9b39












Merge remote-tracking branch 'origin/master' into rename-ci-commit
2016-06-06T14:33:52+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T14:33:52+00:00

d9b292f8726e46050e2d882a9a9fc1be95007d18

# Conflicts:
#	spec/features/builds_spec.rb





# Conflicts:
#	spec/features/builds_spec.rb







Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3
2016-06-06T09:21:54+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T09:21:54+00:00

d225de32cb04a5d5e138463cb170bb19a9f6949c












Merge remote-tracking branch 'origin/master' into rename-ci-commit
2016-06-06T09:20:17+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T09:20:17+00:00

7ad7e10feed624e263b5b80f5cafd4b0ed900ad7












Fix tests offenses: use `pipeline` of Ci::Build and rename views
2016-06-06T09:19:54+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-06T09:19:54+00:00

9614c52266fd7009c1dd2960564d4f65b1a12f80