Robert Speicher 6980489ca8 Merge branch 'api-endpoints-award-emoji' into 'master' ... API endpoints for award emoji Closes #10884 See merge request !4575		2016-06-17 20:49:36 +00:00
..
config
controllers	Merge branch 'disable-saml-account-unlink' into 'master'	2016-06-17 19:27:51 +00:00
factories	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
features	Ensure Todos counters doesn't count Todos for projects pending delete	2016-06-17 16:17:43 -03:00
finders	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
fixtures	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
helpers	Merge branch 'remove_jiraissue' into 'master'	2016-06-17 00:24:10 +00:00
initializers
javascripts	Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' into 'master'	2016-06-16 18:32:23 +00:00
lib	Track method call times/counts as a single metric	2016-06-17 13:09:55 -04:00
mailers	Add previews for all customized Devise emails	2016-06-16 20:10:52 -04:00
models	Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master'	2016-06-17 15:41:59 +00:00
requests	fixup! updated docs for api endpoint award emoji	2016-06-17 22:03:57 +02:00
routing
services	Cache todo counters (pending/done)	2016-06-17 19:04:36 +02:00
support	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export	2016-06-16 13:04:00 +02:00
tasks/gitlab
views
workers	Merge branch 'repo-check-require-push-events' into 'master'	2016-06-17 19:14:43 +00:00
factories_spec.rb
rails_helper.rb
spec_helper.rb
teaspoon_env.rb