Commit graph

33 commits

Author SHA1 Message Date
Martin Bornhold
0f767f23a4 settings: Remove obsolete VCS config value HG_USE_REBASE_FOR_MERGING 2016-06-27 13:30:27 +02:00
Daniel Dourvaris
fa69408b87 javascript: add default value for js generate ini option 2016-06-06 17:27:04 +03:00
Daniel Dourvaris
7bcafe31fd javascript: use separate ini config for generating dynamic js files 2016-06-06 16:38:09 +03:00
Marcin Kuzminski
a51519ed0a encryption: use common method to fetch encryption key for encrypted fields. 2016-06-23 13:48:11 +02:00
Martin Bornhold
93e76a0219 pytest: Unify create_test_* functions. 2016-06-17 13:29:32 +02:00
Martin Bornhold
94211a1998 pytest: Removed unused argument. 2016-06-17 09:48:16 +02:00
Marcin Kuzminski
99bc2e3eeb release: merge back stable branch into default 2016-06-16 23:15:18 +02:00
Martin Bornhold
f6748d4aac oss-licenses: Regenerate python-packages.nix and licenses.json to have a recent version. 2016-06-16 13:01:17 +02:00
Johannes Bornhold
f53ce87693 config: Move HttpsFixup middleware up
Wrapping it around the Pyramid application makes SSL work. Since it also does
things with the strict transport security headers, I kept it this way for now.
Most probably we can shrink it to only contain the htsts things and use the
prefix middleware of paste.
2016-06-16 11:35:55 +02:00
Martin Bornhold
7ab55a64bd oss-licenses: Migrate view to pyramid. 2016-06-15 12:07:48 +02:00
Martin Bornhold
74d78fdec3 oss-licenses: Remove pylons view. 2016-06-15 12:06:49 +02:00
Daniel Dourvaris
a025a9c3f6 errorpages: add appenlight to pyramid layer 2016-06-14 13:13:36 +03:00
Daniel Dourvaris
cb75973073 errorpages: convert general exceptions to error page if toolbar disabled 2016-06-14 12:02:49 +03:00
Daniel Dourvaris
38021f6a30 errorpages: convert webob responses better, include status text + headers 2016-06-14 10:00:01 +03:00
Daniel Dourvaris
c17c69173b errorpages: use original http status for rendered error page 2016-06-14 08:27:18 +03:00
Daniel Dourvaris
fdcf88bd53 pyramid: make responses/exceptions from pyramid/pylons work 2016-06-08 15:21:58 +03:00
Johannes Bornhold
ec516d16f1 db: Move db setup code to seperate function. 2016-06-07 17:17:28 +02:00
Johannes Bornhold
1dcac5eddc db: Remove comment line. 2016-06-07 12:07:51 +02:00
Johannes Bornhold
7fefcc4ffb db: Set rhodecode.is_test in make_pyramid_app instead of make_app
Based on this setting the crypto backend is selected: brypt or md5.
During tests md5 is used to sppedup test execution. We have to move this
setting up to the pyramid layer otherwise the test DB init will use bcrypt
and the tests use md5. This will result in test users not able to login.
2016-06-07 11:13:50 +02:00
Johannes Bornhold
c58dd1646e db: Change ordering of test env setup and db connection init.
- DB init sets rhodecode.model.db.ENCRYPTION_KEY
- Test env setup resets rhodecode.model.db.ENCRYPTION_KEY to None
- Therefore DB init has to be done after test env setup.
2016-06-07 10:26:08 +02:00
Johannes Bornhold
422f825bb8 db: Move initialization of test environment up to pyramid layer. 2016-06-07 09:31:33 +02:00
Johannes Bornhold
35f714fa77 db: Move database initialization up to pyramid.
We need the DB during app setup. Therefore we have to move this up to the
make_pyramid_app function.
2016-06-06 09:05:03 +02:00
Daniel Dourvaris
4b1d4ec44b cleanup: remove couple overlooked lines 2016-06-03 20:58:50 +03:00
Daniel Dourvaris
f56a326436 cleanup: rename class name 2016-06-03 18:15:33 +03:00
Daniel Dourvaris
caa6d21774 cleanup: remove duplicate route 2016-06-03 15:36:04 +03:00
Daniel Dourvaris
04248deccd cleanup: move jsroutes generator function and only generate in
debug mode
2016-06-03 15:33:26 +03:00
Daniel Dourvaris
3041ea6869 refactor: made javascript routes autogenerate based on python routes 2016-06-03 15:10:45 +03:00
Marcin Kuzminski
638a402130 pull-requests: make the catch all route also support nicer format with '-' 2016-06-03 11:56:03 +02:00
Daniel Dourvaris
c683b5b179 feature: Go To switcher now searches commit hashes as well 2016-05-30 16:05:27 +03:00
Johannes Bornhold
4ae78a405b login: Include login configuration. 2016-05-25 08:09:45 +02:00
Johannes Bornhold
9ea67b415c login: Remove pylons login controller. 2016-05-25 11:47:14 +02:00
Johannes Bornhold
3bfdc11350 my_account: Remove oauth identities views from my_account controller. 2016-05-24 17:10:45 +02:00
Marcin Kuzminski
9a0d8c0b77 project: added all source files and assets 2016-05-24 15:56:53 +02:00