summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-01Adding config/config.yml file into .gitignore, cleaning up smaller typosluca-marie
2016-09-01Update on .gitignore to delete an initializers file that doesn't exist any ↵luca-marie
longer
2016-09-01Small updates on method to check if twitter feed enabledluca-marie
2016-09-01Code lives now in twitter_helper.rbluca-marie
2016-09-01Twitter controller now as helper, some more styling in CSS, bug fixluca-marie
2016-09-01Updateluca-marie
2016-09-01One more gif to play withluca-marie
2016-09-01Update in configluca-marie
2016-09-01Update with Twitterluca-marie
2016-08-26Merge branch 'bugfix/load-issue' into 'develop' azul
[load] require login_format_validation in session We moved it into the lib folder so it's not in an autoload path anymore. So now it needs to be required before being used. This fixes a load order issue that would cause non-deterministic failures in CI See merge request !6
2016-08-26[load] require login_format_validation in sessionAzul
We moved it into the lib folder so it's not in an autoload path anymore. So now it needs to be required before being used. This fixes a load order issue that would cause non-deterministic failures in CI
2016-08-19Merge branch 'bugfix/send-406-on-unsupported-format' into 'develop' azul
Bugfix/send 406 on unsupported format See merge request !5
2016-08-19respond_to on a per controller basisAzul
If you inherit respond to and call it again in your controller it will not overwrite the previous but add to it. Since we always have some exceptions from the rules it's probably easiest to be explicit in the controllers that require it themselves.
2016-08-17bugfix: send 406 if an unexpected format is asked forAzul
It used to run the action and then trigger a 500 because the template was not found. fixes !3 .
2016-08-15Merge branch 'upgrade/rails-4' into 'develop' azul
Upgrade/rails 4 See merge request !4
2016-08-15upgrade: everything but rails (upgraded before)Azul
2016-08-15upgrade: rails to latest 4.2 series versionAzul
2016-08-15Merge branch 'cleanup/ci-files' into 'develop' azul
Cleanup/ci files See merge request !3
2016-08-15[ci] gitlab: actually cache bundleAzul
2016-08-15[ci] fix travis by using container buildsAzul
This is supposed to fix the bundler error reported in https://github.com/bundler/bundler/issues/3558 sudo: false makes travis use the new infrastructure without sudo
2016-08-15cleanup: remove outdated travis setupAzul
2016-08-15[ci] move configs into config dirAzul
2016-08-15Merge branch 'test/gitlab-ci' into 'develop' azul
[ci] get gitlab to run tests See merge request !2
2016-08-15[ci] use default db prefix on gitlab and travisAzul
This makes writing the tests for database names easier as they should be the same strings on gitlab, travis and locally.
2016-08-12[db] def database on users instead of use_databaseAzul
use_database affects all uses of prepare_database - so also the one in tmp_database. In order to avoid that we do not use_database but just overwrite the database method itself.
2016-08-12[ci] checkout submodule on gitlabAzul
2016-08-12[db] remove DatabaseMethod import from TemporaryUserAzul
It was causing 404s on initializing the database with db:migrate. DatabaseMethods rewrite of #database does not call prepare_database and thus does not create the database when needed. DatabaseMethod is also quite a bit too much for a model that has two databases that can be memoized easily. There's no way to have a separate database instance per record.
2016-08-12move temporary_user into lib - fix load issueAzul
We already did the same for other concerns. The way we load models for couchrest migrations does not work well with concerns in the model directory as they will be loaded twice.
2016-08-08[ci] setup couch for gitlabAzul
Couch docker image will be available on the host called couchdb. So we use curl to check for it and display the version string. And then we move a couchdb.yml config file into place so the right host will be used.
2016-08-01Add .gitlab-ci.ymlazul
2016-07-14[feature] restrict is_admin in the user api, to only allow queryingNavaL
for him/herself So that it we do not expose the is_admin property to anyone else including other admins.
2016-07-14Merge branch 'develop' of https://github.com/leapcode/leap_web into ↵NavaL
feature/expose_admin_in_api
2016-07-14Merge remote-tracking branch 'pr/229' into developAzul
2016-07-12Merge branch 'develop' of https://github.com/leapcode/leap_web into bugfix_226thea
2016-07-12Merge remote-tracking branch 'pr/230' into developAzul
2016-07-12bugfix: require local email in user modelAzul
2016-07-12bugfix #226:patch instead of putthea
2016-07-07Merge remote-tracking branch 'pr/228' into developAzul
Thanks a lot! First small text fix from the Rails Girls Summer of Code team Load to Code from Berlin
2016-07-07Added missing wordluca-marie
2016-07-05Merge remote-tracking branch 'pr/225' into developAzul
Fix install issue and update the documentation During the rails 4 update db:migrate stopped working because the way couchrest loads all models broke. This includes a fix and also updates the install instructions. I tried to separate advanced topics in development from the others by marking the sections (advanced) in doc/DEVELOP.md
2016-07-05fix email unit test - need to require nowAzul
2016-07-05[doc] make sure to mention develop branch in dev docsAzul
2016-07-05[doc] update install documentationAzul
2016-07-05Fix db:migrate and similar tasksAzul
We saw errors from duplicate loading of LocalEmail and LoginFormatValidation. The latter resulted in a crash. In an attempt to ensure all subclasses of Couchrest::Model::Base are loaded Couchrest::Model::Utils::Migrate requires all files in app/models. We have an extension that does the same for the engines. During this process LoginFormatValidation and LocalEmail were autoloaded when 'identity' was required. Afterwards they were required again. It looks like rails' autoload mechanism does not play nicely with require. So to make sure they are not autoloaded first move the concerns and helper classes into the lib directory and require them explicitly.
2016-07-05Merge remote-tracking branch 'pr/224' into merge-branchAzul
2016-07-05Merge remote-tracking branch 'pr/222' into merge-branchAzul
2016-07-04install: remove thin and thus eventmachine as a dependencyAzul
They led to some install issues. No need to pick a server for dev env.
2016-06-22[feature] expose is_admin in the user apiNavaL
So that whoever consumes the API can use this attribute to determine if admin functionalities should be made available to the current user.
2016-05-23fix config check in submit_signupAzul
with_config is not mean to test the current config. It will set the config. So instead we need to look into APP_CONFIG.
2016-05-23rename destroy_identity to release_handlesAzul
This expresses the intent rather than the implementation. Also replace temp with query refactoring.