gitlab-org--gitlab-foss/spec
Douwe Maan b218e82b5c Merge branch 'issuable-todo-improvements'
# Conflicts:
#	app/controllers/projects/todos_controller.rb
2016-06-18 00:42:36 +02:00
..
config Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
controllers Merge branch 'issuable-todo-improvements' 2016-06-18 00:42:36 +02:00
factories Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
features Merge branch 'issuable-todo-improvements' 2016-06-18 00:42:36 +02: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 Add tests for setting trusted_proxies 2016-05-04 15:49:39 -07:00
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 Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
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 Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
views
workers Merge branch 'repo-check-require-push-events' into 'master' 2016-06-17 19:14:43 +00:00
factories_spec.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
teaspoon_env.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00