delta/gitlab/gitlab-ce.git/app/controllers/projects, branch patch-23 gitlab.com: gitlab-org/gitlab-ce.git Merge branch '32536-mr-widget-performance-improvements' into 'master' 2017-05-23T14:51:15+00:00 Fatih Acet acetfatih@gmail.com 2017-05-19T19:52:45+00:00 677229bb4cce279149e983afdfb86ec18c27e710 Load improvements related to MR widget See merge request !11518 
Load improvements related to MR widget

See merge request !11518
 Merge branch 'fix-issue-32506' into 'master' 2017-05-19T21:57:21+00:00 Douwe Maan douwe@gitlab.com 2017-05-19T19:28:38+00:00 ee712af72674c48a1465b5665da9d0edd71337ad Fix redirects modifying the host Closes #32506 See merge request !11498 
Fix redirects modifying the host

Closes #32506

See merge request !11498
 Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' 2017-05-19T07:32:41+00:00 Douwe Maan douwe@gitlab.com 2017-05-12T20:37:30+00:00 fdc7d7039b83c2d9b3578338408ce28c6423a483 Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298 Conflicts: app/models/merge_request.rb spec/models/merge_request_spec.rb 
Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298

Conflicts:
	app/models/merge_request.rb
	spec/models/merge_request_spec.rb
Added editable concern 2017-05-17T16:10:08+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-05-17T16:09:03+00:00 dc857ab15020c5706405568d9a7d50a23f3e0459 






Remove unneeded media query hiding the edited timeago
2017-05-17T16:10:08+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-05-15T08:51:35+00:00

6dd88474bed70c2aa70c7fdf7ba6dbdc29dc8998

[ci skip] Add edited component for issue_show

Added tests for issue_title_description use of edited and for edited itself

Fix handling is_edited for realtime edit text

Fix tests failures due to whitespace changes

Update edited.vue to include required and default props





[ci skip] Add edited component for issue_show

Added tests for issue_title_description use of edited and for edited itself

Fix handling is_edited for realtime edit text

Fix tests failures due to whitespace changes

Update edited.vue to include required and default props







Merge branch 'enforce-current-user-usage-on-entities' into 'master'

2017-05-10T22:14:01+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-05-10T22:00:52+00:00

6d81a38294b44aee378814aee7fbf2bd0386c888


Make all Serializers receive `current_user` instead `user` [CE]

See merge request !11254





Make all Serializers receive `current_user` instead `user` [CE]

See merge request !11254






Merge branch 'snippets-finder-visibility' into 'security'
2017-05-10T09:09:17+00:00

Douwe Maan
douwe@gitlab.com

2017-04-28T22:06:27+00:00

050d92f8177513b74d6c18d75d35a62f5fa6addd

Refactor snippets finder & dont return internal snippets for external users

See merge request !2094





Refactor snippets finder & dont return internal snippets for external users

See merge request !2094







remove carriage return complaints for rubocop
2017-05-09T23:43:04+00:00

Regis
boudinot.regis@yahoo.com

2017-05-09T23:43:04+00:00

5e734dfed5d639ccac857f971562562ac539d4ac












Merge branch '26944-prometheus-memory-sparkline' into 'master'

2017-05-09T23:33:03+00:00

Fatih Acet
acetfatih@gmail.com

2017-05-09T15:31:14+00:00

38a7f46b2debb8eada14fec7059fe9e4c467c281


Add Prometheus memory sparkline to MR widget

Closes #26944

See merge request !11209





Add Prometheus memory sparkline to MR widget

Closes #26944

See merge request !11209






Merge branch 'mr-widget-redesign-review' into 'master'
2017-05-09T23:19:42+00:00

Jacob Schatz
jschatz@gitlab.com

2017-05-09T04:15:36+00:00

1ba06c8c4b7b8dc4db509adddbaddf34cd80eacc

Merge request widget redesign

Closes #25424 and #27950

See merge request !10319





Merge request widget redesign

Closes #25424 and #27950

See merge request !10319