Skip to content

Push to production#433

Merged
joshsmith merged 17 commits into
masterfrom
develop
Jul 8, 2016
Merged

Push to production#433
joshsmith merged 17 commits into
masterfrom
develop

Conversation

@joshsmith

Copy link
Copy Markdown
Contributor

No description provided.

joshsmith and others added 17 commits July 4, 2016 21:51
Split name into first and last, rewrite model and API specs
Fix issue with Sinatra rack temporarily
Rails upgrade from 4.2.5.1 to 5.0.0
Update vagrant configuration

Update AMS renderer

Fix specs for json api content type

Update Vagrantfile to account for ports < 1024

Fix for nil case in specs

Add elasticsearch

Fix import specs

Update docs
Create #add_url_protocol method for before_save on users, update exis…
Update docker and README

Add ruby version

Update README

Update bundler until bugs are fixed

Clean up Dockerfile and remove Ansible

Remove Ansible shell scripts

Update setup scripts and dockerfile again

Update bin and colors

Update docs
Add first and last name to analytics tracking

Add adapter and remove scenario

Change location of adapter and write spec for mailing list

Add worker and spec

Add controller specs for signing up

Add rake task
Subscribe users to mailchimp on signup
serialization =
ActiveModel::Serializer::Adapter.create(serializer, include: includes, meta: meta)
ActiveModelSerializers::Adapter.create(
serializer,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indent the first parameter one step more than the start of the previous line.

@joshsmith joshsmith merged commit 7a52adf into master Jul 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants