Commit graph

3587 commits

Author SHA1 Message Date
Matt Rogers
b5faedb4ff
Use reload to reload AR models
Passing a boolean to the model method will stop working in Rails 5.

Co-Authored-By: Dan Rice <dnrce@users.noreply.github.com>
2018-09-22 13:12:23 -05:00
Matt Rogers
506f3f991a
Convert render :nothing => true to head :ok
Co-Authored-By: Dan Rice <dnrce@users.noreply.github.com>
2018-09-22 13:06:38 -05:00
Matt Rogers
17f704a074
Convert after_filter to after_action
Co-Authored-By: Dan Rice <dnrce@users.noreply.github.com>
2018-09-22 13:04:46 -05:00
Matt Rogers
5805c511bb
Convert render :text to render :body
Co-Authored-By: Dan Rice <dnrce@users.noreply.github.com>
2018-09-22 13:03:35 -05:00
Matt Rogers
60ae4f6f5f
Convert before_filter to before_action
`before_filter` has been removed in future versions of rails.

Co-Authored-By: Dan Rice <dnrce@users.noreply.github.com>
2018-09-22 12:55:27 -05:00
Matt Rogers
dab358cad0
Merge pull request #2116 from hewo/feature_rails_update_4_2_10
Feature rails update 4.2.10
2018-09-13 21:31:31 -05:00
Matt Rogers
e8acabcd8f
Merge pull request #2114 from greysteil/dependabot/bundler/rubyzip-1.2.2
Bump rubyzip from 1.2.1 to 1.2.2
2018-09-04 13:18:23 -05:00
dependabot[bot]
ef33f0d292
[Security] Bump rubyzip from 1.2.1 to 1.2.2
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-31 18:01:59 +00:00
Heiner Wohner
edcef6c624 Merge branch 'master' of https://github.com/TracksApp/tracks 2018-08-30 17:29:18 +02:00
Heiner Wohner
9fa6f16895 updates Rails to 4.2.10 2018-08-30 16:22:35 +02:00
Matt Rogers
19220497db
Merge pull request #2113 from ericmoon/test-cleanup
Test cleanup
2018-08-04 13:31:35 -05:00
ericmoon
a92317f0b5 stupid typos 2018-08-02 11:58:56 -07:00
ericmoon
589ee75168 another assert_nil hack 2018-08-02 11:52:01 -07:00
ericmoon
04d5e764b2 typo fix 2018-08-02 11:43:48 -07:00
ericmoon
429a22778c hack to remove minitest deprecation warnings 2018-08-02 11:31:50 -07:00
ericmoon
fa7f2a777b assert_equal nil deprecated: replace with assert_nil 2018-08-02 10:57:11 -07:00
ericmoon
a94861ef81 gemfile update 2018-08-02 10:32:35 -07:00
ericmoon
095164bc71 change factory_girl to factory_bot - rename 2018-08-02 10:19:13 -07:00
Matt Rogers
6b9f24ce03
Merge pull request #2112 from ericmoon/master
remove cucumber, some minor gem cleanup
2018-07-30 14:28:56 -05:00
Eric Moon
5459dcd8d0
docile 1.1.0 -> docile 1.1 2018-07-28 11:46:53 -07:00
Eric Moon
053a4e129c
downgrade codeclimate-test-reporter from 1.0.8 to 1.0.7
Removes the dependency on simplecove <0.13 - minimizing changes in codelevels for now.
If you rebuild the Gemlock.file, you'll have to limit codeclimate-test-reporter in the Gemfile itself to keep this downgrade.
2018-07-28 11:38:33 -07:00
Eric Moon
077b763701
autoprefixer-rails reverted to 8.6.x version 2018-07-28 11:18:58 -07:00
Eric Moon
c448189bac
Move back to 1.9 hash style 2018-07-28 11:05:25 -07:00
Eric Moon
3e71d4be87
Delete .codeclimate.yml
done playing with codeclimate
2018-07-27 10:05:49 -07:00
ericmoon
0ac8cbe76f playing with codeclimate 2018-07-26 11:55:27 -07:00
ericmoon
6bb127060c gem cleanup 2018-07-25 12:03:06 -07:00
ericmoon
7d157d0f68 gemfile.lock 2018-07-24 15:26:53 -07:00
ericmoon
85a299793a gem cleanup from cucumber takeout 2018-07-24 14:36:13 -07:00
ericmoon
6b581a22e1 secure git in gemfile 2018-07-24 13:25:36 -07:00
ericmoon
0c443493df git switch to https in gemfile.lock 2018-07-24 13:04:22 -07:00
ericmoon
242adab0cc cucumber removal cleanup 2018-07-24 12:49:18 -07:00
ericmoon
6dcaa76f09 cucumber removal 2018-07-24 12:34:55 -07:00
Matt Rogers
97bfad71ca
Merge pull request #2098 from hewo/mobile-ui
Fix german locale mobile Header; refs #1745
2018-07-23 08:59:27 -05:00
Matt Rogers
3059a273a4
Merge pull request #2111 from TracksApp/use-scripts-for-more-operations
Remove some friction when running in development
2018-07-21 10:33:34 -05:00
Matt Rogers
e4e6b78f91
Add a script for running a server
In addition to following the 'script to rule them all' pattern, this
makes it easier to bring up a rails server by abstracting all the docker
things away (of which there are quite a few) and will prevent changes to
the binstubs from being able to run a server for development purposes.
2018-07-21 10:21:54 -05:00
Matt Rogers
36e29b82c8
Add a script to bring up a console
In addition to following the 'scripts to rule them all' pattern, this
makes it easier to pull up a console by abstracting all the docker
things away and will prevent a change to the binstubs from being able to
run a rails console.
2018-07-21 10:20:28 -05:00
Matt Rogers
ec2b6cf22e
Publish ports based on environment variable
Allows two things:

1. Access a running server from outside the docker container
2. Run both a console and a server at the same time, for debugging or
whatever else.
2018-07-21 10:18:31 -05:00
Matt Rogers
b0993b0c76
Merge pull request #2109 from TracksApp/risky-gem-updates
Upgrade lots of gems
2018-06-19 20:46:25 -05:00
Matt Rogers
ab6e04d4c1
Upgrade lots of gems
This is pretty risky, as there are some major version bumps in here and
I didn't check everything to ensure things are still working. I only ran
the test suite. So, YOLO, I guess. ¯\_(ツ)_/¯
2018-06-19 20:38:52 -05:00
Matt Rogers
82dc7b395a
Merge pull request #2108 from TracksApp/update-gems
Update some gems
2018-06-19 08:30:51 -05:00
Matt Rogers
dd16a24b97
Update Rails to 4.2.10 2018-06-18 20:45:00 -05:00
Matt Rogers
a68d73326f
Update rubocop 2018-06-18 20:13:13 -05:00
Matt Rogers
2ed4544ab3
Merge pull request #2106 from TracksApp/stop-using-the-ci-tasks
Use `rake test` instead of `ci:lite`
2018-05-31 10:06:59 -05:00
Matt Rogers
f1d2c7c0f2
Use rake test instead of ci:lite
The `ci:lite` task is busted but the `test` task works just fine.
2018-05-31 09:56:51 -05:00
Matt Rogers
a4476ae74a
Merge pull request #2103 from TracksApp/update-docker-configuration
Update the docker configuration
2018-05-31 08:09:56 -05:00
Matt Rogers
ff522ec6e4
Use rake db:reset to get a good database 2018-05-31 07:59:47 -05:00
Matt Rogers
49bc3eb0cd
Poll for the database to be up before running tests 2018-05-30 08:21:21 -05:00
Matt Rogers
9f65d809da
Increase the time to wait for the DB.
If this doesn't work, I'll implement a poll mechanism next.
2018-05-29 20:26:17 -05:00
Matt Rogers
7dd8e8caec
Use a script/cibuild to control the CI process
We need some extra setup work that's easier to accomplish in a separate
script than embedding it all in the Travis CI configuration. Follow the
scripts-to-rule-them-all pattern from GitHub and add a script/cibuild
for that purpose.
2018-05-29 20:14:19 -05:00
Matt Rogers
68ce8ad1ae
put a site.yml file in place for CI 2018-05-26 20:07:35 -05:00