Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-18 00:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3587 commits 31 branches 36 tags 32 MiB
Commit graph

3587 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Rogers
c809abe289
Use the octal version of chmod 
The prior command was wrong. I also know exactly what I'm getting with
this version.
 2018-05-25 22:23:51 -05:00
Matt Rogers
672f43f03e
build the compose file before running tests 2018-05-25 22:18:33 -05:00
Matt Rogers
93c2f03efd
Skip Travis-CI's default installation steps 
We shouldn't need this since we're doing everything inside a docker
container
 2018-05-25 22:08:07 -05:00
Matt Rogers
d3a3dde421
Add the test database definition back 
It's needed for the tests and should have never been removed in the
first place.
 2018-05-25 22:07:09 -05:00
Matt Rogers
44117e73d8
fix the volume declaration 2018-05-25 22:07:04 -05:00
Matt Rogers
427f2d23ba
Don't set a language or bundler args 
docker-compose will take care of building the image for us so we don't
need to set up ruby things or run bundler as part of the travis build
process. We just need to go straight to Docker.
 2018-05-14 18:57:48 -05:00
Matt Rogers
400f0efa4e
DATABASE_URL no longer needs to be set. 2018-05-14 18:53:16 -05:00
Matt Rogers
d7d7510c8d
Update the travis configuration 
Makes use of Travis' docker services, installing newer versions of both
docker and docker-compose.

This necessarily removes multiple Ruby version support since that's now
being controlled by the docker image we're using for builds.
 2018-05-14 18:49:51 -05:00
Matt Rogers
108373f938
Bring back database.yml 
It only contains the development database configuration by default since
we're relying on docker-compose for starting our database now.
 2018-05-14 18:49:19 -05:00
Matt Rogers
faceaac874 Modify the binstubs to run things in docker 2018-05-02 16:08:41 -05:00
Matt Rogers
99ef4af3e5 Add a docker-compose.yml file 
Defines the services that we'll use while developing Tracks. So far,
this is just a separate database service.
 2018-04-25 20:10:31 -05:00
Matt Rogers
cde2108129
Add a new, slimmer Dockerfile 
We'll use docker-compose for providing the other dependencies.
 2018-04-25 19:44:21 -05:00
Matt Rogers
7922ae46de Rename Dockerfile to Dockerfile.passenger 
I want to slim down the normal Dockerfile so it makes it easier to do
development with a docker based workflow.
 2018-04-25 19:42:21 -05:00
Heiner Wohner
16bb214912 Merge branch 'mobile-ui' 2018-01-23 10:30:16 +01:00
Heiner Wohner
9bf7f916dc Fix german locale mobile Header; refs #1745 2018-01-23 10:20:10 +01:00
Matt Rogers
120af87110
Merge pull request #2097 from hewo/ssl 
Makes force_ssl configurable
 2018-01-22 15:04:16 -06:00
Heiner Wohner
c028c6c8b5 document force_ssl option 2018-01-22 18:18:04 +01:00
Heiner Wohner
047fb0acb1 Makes force_ssl configurable 2018-01-22 14:43:04 +01:00
Matt Rogers
a65ab48b9f
Merge pull request #2096 from RyanTruran/origin 
A more rational way to load the text input with the previous names
 2018-01-03 09:31:36 -06:00
Ryan Truran
db7603f799 A more rational way to decode the html entities in editable 
a more rational way to handle edit fields

revert to previous

add html_safe
 2017-12-28 10:01:54 -06:00
Matt Rogers
0c18ebecc5 Merge pull request #2086 from TracksApp/fix-top-10-longest-running 
Fix the top 10 longest running projects list
 2017-07-30 15:22:56 -05:00
Matt Rogers
eaedd53875 Add a test for longest running projects 2017-06-19 09:24:10 -05:00
Matt Rogers
500892e1a4 Fix the top 10 longest running projects list 
Sorting by running time without a reverse takes the shortest running
projects.
 2017-06-13 17:12:15 -05:00
Matt Rogers
29421661fb Merge pull request #2082 from dnrce/installation-wiki 
Move alternative installation options to the wiki
 2017-05-20 09:49:34 -05:00
Dan Rice
0bb548d116 Move alternative installation options to the wiki 
[ci skip]
 2017-05-20 10:25:26 -04:00
Dan Rice
a8e2978054 Use Firefox 45 ESR for webdriver compatibility (#2079) 2017-03-19 16:46:04 -04:00
Dan Rice
0d99c3df74 Merge pull request #2078 from dnrce/skip-known-failures 
Uncomment but skip tests for known issues
 2017-03-19 16:45:36 -04:00
Dan Rice
b50456d04d Uncomment but skip tests for known issues 2017-03-19 14:13:26 -04:00
Dan Rice
881faa0d02 Merge pull request #2070 from C-Otto/fix-2069 
reorder buttons for recurring todos to make the order uniform
 2017-03-19 14:09:28 -04:00
Carsten Otto
b7bada0791 reorder buttons for recurring todos to make the order uniform 
fixes #2069
 2017-03-18 14:42:34 +01:00
Dan Rice
6fbec08e09 Merge pull request #2067 from C-Otto/rendering_helper_tests 
Move and refactor tests for `rendering_helper`
 2017-03-07 17:34:24 -05:00
Carsten Otto
afb0f03fd3 add tests for open issues 2017-03-07 22:08:12 +01:00
Carsten Otto
c0d20f2e1f move existing tests to rendering_helper_test 2017-03-07 22:08:12 +01:00
Carsten Otto
ccac45b377 fix typo 2017-03-05 13:56:36 +01:00
Dan Rice
b8ab28819c Merge pull request #2064 from C-Otto/master 
add missing space
 2017-02-28 22:00:08 -05:00
Carsten Otto
238b2fd670 add missing space 
bug introduced in c46e5a9e1d

fixes #2063
 2017-02-28 22:16:48 +01:00
Dan Rice
26d0c873c7 Merge pull request #2062 from dnrce/swfobject 
Limit use of SWFObject to the stats page
 2017-02-12 15:43:24 -05:00
Dan Rice
55c5d07aff Limit swf_fu to the stats page 
Fixes #2061
 2017-02-12 15:27:00 -05:00
Dan Rice
7ff34bbea8 Drop vendored SWFObject. Included in swf_fu. 2017-02-12 15:16:05 -05:00
Dan Rice
1d80bed077 Merge pull request #2060 from dnrce/fix-ci-1.9.3 
Hold rubocop back to fix tests on 1.9.3
 2017-02-11 21:10:19 -05:00
Dan Rice
69de2459a9 Hold rubocop back to fix tests on 1.9.3 2017-02-11 20:22:52 -05:00
Dan Rice
1ba829e960 Merge branch '2.3_branch' 2016-10-15 13:13:02 -04:00
Matt Rogers
e01872d515 Merge pull request #2016 from C-Otto/fix-feeds-2.3 
use @not_done_todos for feeds
 2016-08-27 10:12:59 -05:00
Dan Rice
80ec0b6df0 Add RuboCop 
* Exclude bin/ because it's generated code
* Max line length of 120 characters
* Documentation not required
* Prefer double-quoted strings
 2016-08-27 10:09:14 -05:00
Matt Rogers
7a898ecd23 Merge pull request #2039 from TracksApp/graceful-fallback-for-missing-i18n-keys 
Add a fallback to :other for i18n
 2016-08-26 21:24:19 -05:00
Matt Rogers
ddffe8f529 Merge pull request #2040 from TracksApp/eventmachine-for-el-capitan 
Update eventmachine to 1.2.0.1
 2016-08-26 21:24:07 -05:00
Matt Rogers
25339ebc73 Merge pull request #2041 from TracksApp/case-insensitive-tag-searching 
Use Arel to generate case insensitve tag searches
 2016-08-26 21:23:45 -05:00
Matt Rogers
c2296b5b99 Use Arel to generate case insensitve tag searches 2016-08-25 23:10:40 -05:00
Matt Rogers
c6b1151197 Update eventmachine to 1.2.0.1 
Our previous version - `1.0.7` - is not compatible with OS X El Capitan.
Upgrading to the latest version fixed this issue.
 2016-08-20 15:52:42 -05:00
Matt Rogers
0511ea3a3a Add a fallback to :other for i18n 
In most cases, translations don't supply `:few` even though the language
may support the construct. Instead of the app blowing up if the
translation for `:few` doesn't exist, fall back to `:other` instead.
 2016-08-20 14:43:42 -05:00