Hiroyuki Sato 9b25bbc45d Merge branch 'master' into 1827-prevent-concurrent-editing-wiki ... Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb		2017-07-23 21:26:02 +09:00
..
assets	Merge branch '35236-svg-logo' into 'master'	2017-07-21 16:59:18 +00:00
controllers	Merge branch 'master' into 1827-prevent-concurrent-editing-wiki	2017-07-23 21:26:02 +09:00
finders	Clear issuable counter caches on update	2017-07-19 10:21:20 +01:00
helpers	Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' into 'master'	2017-07-21 13:54:52 +00:00
mailers	Create and use project path helpers that only need a project, no namespace	2017-07-05 11:11:59 -05:00
models	Merge branch 'master' into 1827-prevent-concurrent-editing-wiki	2017-07-23 21:26:02 +09:00
policies	Make sure it checks against the tag only when it's a tag	2017-07-18 16:42:13 +08:00
presenters	Make commits behind text a link to the target branch commits page	2017-07-11 11:49:22 -05:00
serializers	Make commits behind text a link to the target branch commits page	2017-07-11 11:49:22 -05:00
services	Merge branch 'master' into 1827-prevent-concurrent-editing-wiki	2017-07-23 21:26:02 +09:00
uploaders	Merge branch '33359-pers-snippet-files-location' into 'security-9-3'	2017-07-19 22:28:27 -05:00
validators	Implement ayufan validator2	2017-07-06 00:59:45 +09:00
views	Merge branch 'master' into 1827-prevent-concurrent-editing-wiki	2017-07-23 21:26:02 +09:00
workers	Skip dead jobs queue for web hooks and project services	2017-07-17 16:38:02 +01:00