Kamil Trzcinski 0b4981e771 Merge remote-tracking branch 'origin/master' into knapsack ... # Conflicts: # .gitlab-ci.yml		2016-06-07 10:29:43 +02:00
..
config	…
controllers	Merge branch 'notes-are-awardables' into 'master'	2016-06-06 16:48:35 +00:00
factories	Add a `U2fRegistrations` table/model.	2016-06-06 12:50:31 +05:30
features	Merge branch 'jquery2' into 'master'	2016-06-06 14:25:23 +00:00
finders	…
fixtures	…
helpers	Merge branch 'master' into awardables	2016-05-30 18:54:08 +02:00
initializers	…
javascripts	Merge branch 'notes-are-awardables' into 'master'	2016-06-06 16:48:35 +00:00
lib	Merge branch 'issue_3359' into 'master'	2016-06-06 19:14:01 +00:00
mailers	Update tests for the current_application_settings request store changes	2016-05-27 19:05:52 -07:00
models	Merge branch 'notes-are-awardables' into 'master'	2016-06-06 16:48:35 +00:00
requests	Merge branch 'master' into awardables	2016-06-03 15:20:11 +02:00
routing	…
services	Fix spec	2016-06-03 17:14:23 -05:00
support	Add feature specs covering U2F registration and authentication.	2016-06-06 12:50:31 +05:30
tasks/gitlab	…
views	…
workers	…
factories_spec.rb	…
knapsack_merger.rb	Try to use knapsack	2016-06-03 17:08:17 +02:00
rails_helper.rb	…
spec_helper.rb	Use knapsack everywhere	2016-06-03 17:39:53 +02:00
teaspoon_env.rb	Add leading comment space cop	2016-05-31 19:33:46 -03:00