4221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew Brown	0fad23504e	Merge branch 'master' into serendipitous-improvements	2016-10-04 00:24:29 +02:00
Andrew Brown	b513267d62	Merge pull request #101 from indentlabs/add-scout-gem ... Add scout_apm gem	2016-10-04 00:24:04 +02:00
Andrew Brown	a5e9fd7601	Merge branch 'master' into serendipitous-improvements	2016-10-04 00:21:20 +02:00
Andrew Brown	b3c130acd6	Merge branch 'master' into add-scout-gem	2016-10-04 00:21:15 +02:00
Andrew Brown	53863c33ad	Merge pull request #102 from indentlabs/achetype ... Achetype: new PR resolves merge conflict with master	2016-10-04 00:21:09 +02:00
Andrew Brown	6f381c889d	Merge branch 'master' into achetype ... Conflicts: db/schema.rb	2016-10-04 00:16:56 +02:00
Andrew Brown	6fc562c97b	Merge branch 'master' into serendipitous-improvements	2016-10-04 00:14:12 +02:00
Donovan Hernandez	44ee57edfb	Add scout_apm gem	2016-10-03 17:14:11 -05:00
Andrew Brown	59d5c2a336	Merge pull request #100 from indentlabs/no-more-notice ... Revert "Add emergency maintenance notice"	2016-10-04 00:14:06 +02:00
Andrew Brown	8c6ba6b938	Revert "Add emergency maintenance notice" ... This reverts commit f82ccc379e.	2016-10-03 23:53:27 +02:00
Andrew Brown	2c1da7d80c	Merge branch 'master' into serendipitous-improvements	2016-10-03 23:30:42 +02:00
Andrew Brown	5ddb469562	Merge pull request #99 from indentlabs/add-maintenance-notice ... Add emergency maintenance notice	2016-10-03 23:26:54 +02:00
Andrew Brown	f82ccc379e	Add emergency maintenance notice	2016-10-03 23:23:05 +02:00
Andrew Brown	14e1226473	Merge branch 'master' into serendipitous-improvements	2016-10-03 22:52:49 +02:00
Andrew Brown	58979db119	Merge pull request #77 from indentlabs/add-item-past-owners ... Add 'past owners' relation on items	2016-10-03 22:34:08 +02:00
Andrew Brown	3b92e011a0	Merge branch 'master' into add-item-past-owners	2016-10-03 22:02:11 +02:00
Andrew Brown	cbe37b40c4	Merge branch 'master' into serendipitous-improvements	2016-10-03 22:02:02 +02:00
Andrew Brown	f277853df2	Couple other typos	2016-10-03 21:41:33 +02:00
Andrew Brown	d0f33cbbb0	Merge pull request #62 from indentlabs/feature/migrate-tests ... Migrate tests to rspec and cucumber	2016-10-03 14:13:05 +02:00
Ashley Sullins	eb281b6165	Add archetype to character information	2016-10-02 22:24:52 -05:00
Robert Richter	ab30d6b2e9	Alphabetize gems	2016-10-02 20:30:42 -05:00
Robert Richter	16eaf40109	Clean up gemfile groups and unused gems	2016-10-02 20:26:50 -05:00
Robert Richter	901d76c890	Make serendipitous card more robust	2016-10-02 14:47:52 -05:00
Robert Richter	47166e1e72	Use rspec-prof	2016-10-02 14:18:05 -05:00
Robert Richter	f4d49a43ae	Update to ruby 2.3.1	2016-10-02 14:03:27 -05:00
Robert Richter	922bea78fe	Resolve some unitialized variable warnings	2016-10-02 13:06:15 -05:00
Robert Richter	c0cc119cd7	Resolve Devise deprecation warning	2016-10-02 12:49:24 -05:00
Robert Richter	db0a6e721b	Ruby and bundle update	2016-10-02 12:47:20 -05:00
Robert Richter	1ca2444b39	Resolve warning message	2016-10-02 12:02:54 -05:00
Robert Richter	930e30281c	Add basic performance test	2016-10-02 12:01:21 -05:00
Robert Richter	45e452651a	Make rubocop changes	2016-10-01 19:00:09 -05:00
Robert Richter	56b744a858	Add coverage report	2016-10-01 18:46:08 -05:00
Andrew Brown	7e8c60bbe0	Add 'past owners' relation on items	2016-10-02 01:41:31 +02:00
Robert Richter	7fda4f9a0f	Delete unused files	2016-10-01 18:31:08 -05:00
Robert Richter	03794942b6	Write feature for serendipitous	2016-10-01 18:27:47 -05:00
Robert Richter	8433fbdd8a	Write accounts feature	2016-10-01 17:48:27 -05:00
Robert Richter	18552566b1	Delete integration tests that are not needed	2016-10-01 17:20:22 -05:00
Robert Richter	cd6bc7c648	Add universes to content feature tests	2016-10-01 17:18:52 -05:00
Robert Richter	d1412624ae	Abstract feature tests to cover all content types	2016-10-01 17:17:34 -05:00
Robert Richter	f46efa0c1e	Write character feature	2016-10-01 17:05:14 -05:00
Robert Richter	40481975f4	Merge branch 'master' into feature/migrate-tests	2016-10-01 14:38:51 -05:00
Robert Richter	3ad2a19172	Write main and write controller spec	2016-10-01 13:33:27 -05:00
Robert Richter	ed469df43f	Write locations generator controller spec	2016-10-01 13:29:55 -05:00
Robert Richter	411952ece6	Write equipment generator controller spec	2016-10-01 13:16:51 -05:00
Robert Richter	8e53097d8b	Write character generator controller spec	2016-10-01 12:54:14 -05:00
Robert Richter	d22ada1714	Write specs for items, locations, and universes	2016-10-01 12:25:35 -05:00
Robert Richter	1ce16228a7	Extract content tests into an example	2016-10-01 12:21:19 -05:00
Robert Richter	5977df3968	Write CharactersController spec	2016-10-01 11:57:43 -05:00
Andrew Brown	e4b6bbbc8d	Fix crops typo	2016-10-01 18:45:36 +02:00
Andrew Brown	a63078c7ef	Merge pull request #73 from indentlabs/polish-landing ... Verbiage tweaks on landing page	2016-10-01 18:32:05 +02:00