summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-23upgrade: use rails4s 'secret_key_base'Azul
This will get us encrypted cookies but also requires changes to the platform. fixes #23
2017-03-22Merge branch 'upgrade/bundle' into 'master' azul
upgrade: bundle Closes #13 See merge request !23
2017-03-22upgrade: bundleAzul
update all the dependencies. minitest now wants assert_nil instead of assert_equal nil, ... braintree now uses update_attributes rather than save.
2017-03-21Merge branch 'bugfix/deliver_now' into 'master' azul
upgrade: rails4.2 deprecated deliver -> deliver now Closes #16 See merge request !22
2017-03-21upgrade: rails4.2 deprecated deliver -> deliver nowAzul
fixes #16
2017-03-21Merge branch 'test/admin-user-api' into 'master' azul
test: admin user api always green Closes #17 See merge request !21
2017-03-21test: admin user api always greenAzul
Used to fail because the record already existed in the database fixes #17
2017-03-21Merge branch 'bugfix/404-for-keys-on-text-request' into 'master' azul
fix: 404 on key request with non html content-type Closes #8 See merge request !20
2017-03-21fix: 404 on key request with non html content-typeAzul
2017-03-20Merge branch 'bugfix/404-for-missing-info' into 'master' azul
fix: 404 for missing pages template - fixes #9 Closes #9 See merge request !19
2017-03-20fix: 404 for missing pages template - fixes #9Azul
2017-03-20Merge branch 'test/404-error-test' into 'master' azul
test: 404 response for missing key See merge request !18
2017-03-20test: 404 response for missing keyAzul
enable testing error responses on the full rack stack.
2017-03-20Merge branch 'bugfix/require-html-for-home-routes' into 'master' azul
bugfix: format: html for home roots See merge request !17
2017-03-20bugfix: format: html for home rootsAzul
That's the only thing the controller handles meaningful. Before the route would also catch anything that started with a . interpreting it as a format string. This lead to lots of false positives in our security scanner.
2017-03-20Merge branch 'debug/rescue-more-specifically' into 'master' azul
make the rescue in account creation less broad See merge request !15
2017-03-14Merge branch 'recovery-code' into 'master' azul
Update recovery code See merge request !16
2017-03-10Validates recovery code as hexadecimal data.Thais Siqueira
Related with https://github.com/pixelated/pixelated-user-agent/issues/924 With @aarni
2017-03-10Adds recovery code to user accountThais Siqueira
Related with https://github.com/pixelated/pixelated-user-agent/issues/924 With @aarni
2017-03-07make the rescue in account creation less broadAzul
It was catching errors that should have led to 500s
2017-03-07Merge branch 'username-with-dot' into 'master' azul
Fix keys route to accept usernames with dots See merge request !14
2017-03-02Fix keys route to accept usernames with dotsTulio Casagrande
2017-02-21Merge branch 'gitignore_remote_userfiles' into 'master' azul
Ignore files created by working as user leap-webapp See merge request !13
2017-02-21Ignore files created by working as user leap-webappvarac
2017-02-20Delete .gitkeep in config/customization azul
The Readme file in the folder already ensures that it is kept. The .gitkeep was causing diffs in production
2016-11-21Merge branch 'bugfix/handle-missing-ticket-params' into 'master' azul
bugfix: handle missing params for ticket gracefully This used to trigger a 500. Fixes [#8395](https://leap.se/code/issues/8395) See merge request !11
2016-11-21bugfix: handle missing params for ticket gracefullyAzul
This used to trigger a 500. Fixes #8395
2016-11-17Merge branch 'bugfix/error-dups' into 'master' azul
bugfix: only send login errors once If a login was invalid as a username but also for the identity we used to have duplicate error messages. Let's avoid that. Also added a test to make sure invite_code errors are properly displayed no matter what other fields are set or missing. Pixelated will rely on this to test invite codes See merge request !10
2016-11-17bugfix: only send login errors onceAzul
If a login was invalid as a username but also for the identity we used to have duplicate error messages. Let's avoid that. Also added a test to make sure invite_code errors are properly displayed no matter what other fields are set or missing. Pixelated will rely on this to test invite codes
2016-11-17Merge branch 'ci/cache-gems' into 'master' azul
Ci: cache gems between builds See merge request !9
2016-11-17ci: share cache for gems between branches and jobsAzul
bundler and rubygems should be robust enough to share one dir in different branches. This way gems can be reused. If new versions are required they will just be added to the shared cache.
2016-10-24doc: mention gitlab buildsAzul
2016-10-21docs: tweak install instructionsAzul
no more develop branch but detail nokogiri requirements a bit
2016-10-20Merge remote-tracking branch 'origin/develop'Azul
We'll only use the master branch for development from now on.
2016-10-08Merge remote-tracking branch 'pr/241' into developAzul
2016-09-30Merge pull request #19 from LoadToCode/theatheaamanda
changed number 2 to 3 to have three tweets shown
2016-09-30changed number 2 to 3 to have three tweets shownthea
2016-09-30Merge pull request #18 from LoadToCode/theatheaamanda
added 'show more tweets'-link when more tweets are existing than displayed + method included to set number of tweets which should be displayed
2016-09-30added 'show more tweets'-link when more tweets are existing than displayed, ↵thea
method included to set number of tweets which should be displayed
2016-09-29Merge branch 'thea' of github.com:LoadToCode/leap_web into theathea
2016-09-26Display provider message next to tweets aswellAzul
The content.html.haml was modified to pick the layout based on wether tweets are enabled or not. We need to display the provider message in both cases.
2016-09-26Merge remote-tracking branch 'pr/239' into developAzul
2016-09-23Adapted description to use case 'tweets are protected'luca-marie
2016-09-23Fixed typo in helperluca-marie
2016-09-23Merge branch 'marie' into developthea
2016-09-23merging develop and mariethea
2016-09-23included count for tweet fetchthea
2016-09-23Merge pull request #16 from LoadToCode/temp_1_marieMarie
Temp 1 marie
2016-09-23increase number of fetched tweets to make sure 3 most recent tweets without ↵luca-marie
RTs and @ are displayed
2016-09-23Doc updated on how to customize avatar picture in twitter feature; update ↵luca-marie
error response messages; added 'config/customization/images' + link in 'config/initializer/customization.rb'