delta/gitlab/gitlab-ce.git/app/controllers/projects/notes_controller.rb, branch feature-flags gitlab.com: gitlab-org/gitlab-ce.git Use feature flags for notes and award emojis 2016-06-10T11:19:43+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-06-09T15:17:01+00:00 beed70c0248fea13bdf727e5f14dee362b0cd298 This allows us to disable creating/updating/removing of notes as well as toggling of award emojis. 
This allows us to disable creating/updating/removing of notes as well as
toggling of award emojis.
Backend awardables on comments 2016-06-06T09:03:39+00:00 ZJ van de Weg zegerjan@gitlab.com 2016-05-25T19:07:36+00:00 2f9c2149a38e8a4067cb50c1cd1bbb1e72c263b3 






Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables
2016-05-18T18:23:40+00:00

Fatih Acet
acetfatih@gmail.com

2016-05-18T18:23:40+00:00

6c89e2fd41a39e2cfde623405d01aa63469370d1












Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
2016-05-18T18:05:53+00:00

Fatih Acet
acetfatih@gmail.com

2016-05-18T18:05:53+00:00

bb883387f9e4d5564b455cce7d412f730664a2f5

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb





# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb







Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'
2016-05-18T17:48:23+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-05-18T17:48:23+00:00

253a017b0173ae12d83dc4c6976f1b0a838448a6

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





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







Fix latests concerns
2016-05-18T13:47:15+00:00

ZJ van de Weg
zegerjan@gitlab.com

2016-05-17T17:28:17+00:00

e0cabb67d0492907e6cef21bb0ef21a6e953b70b












Extract LegacyDiffNote out of Note
2016-05-13T22:31:43+00:00

Douwe Maan
douwe@selenight.nl

2016-05-10T22:41:46+00:00

99d3e21f19ffb5cccb58fdfeac4fb6174e7e65e2












Add tests on Awardables and Award Emoji
2016-05-10T10:03:13+00:00

Zeger-Jan van de Weg
zegerjan@gitlab.com

2016-04-25T18:10:20+00:00

dccf8a9fc8d4dde91942944f6b47387bfb13c380












Create table for award emoji
2016-05-06T08:47:11+00:00

Zeger-Jan van de Weg
zegerjan@gitlab.com

2016-04-16T19:09:08+00:00

3bdc57f0a710b3769381ecad7ea4098223ecff56












Fix code review issues
2016-04-12T12:24:05+00:00

Robert Schilling
rschilling@student.tugraz.at

2016-04-06T17:04:17+00:00

9aefaa41ab1442f81ffc15ad9a8279bd1e92c91a