Douwe Maan 95f9d6d83b Merge branch 'master' into issue-discussions-refactor ... # Conflicts: # app/controllers/concerns/notes_actions.rb # spec/features/task_lists_spec.rb # spec/support/features/issuable_slash_commands_shared_examples.rb		2017-07-31 10:23:50 +02:00
..
components	IssueNotesRefactor: Implement time tracking sidebar integration with slash commands.	2017-07-22 00:55:55 +03:00
services
stores	add loading spinner to sidebar assignees	2017-05-24 21:19:50 +10:00
event_hub.js	Prevent vue.esm.js from being bundled into the primary JS bundle	2017-05-09 13:43:08 +00:00
sidebar_bundle.js	moved some more inline code	2017-07-25 16:46:15 +01:00
sidebar_mediator.js	Update vue-resource	2017-07-12 14:47:09 +00:00