Code

WIP: Mapknitter Rails Upgrade#669

Code

Open

alaxalves wants to merge 179 commits intomainpubliclab/mapknitter:mainfrom developmentpubliclab/mapknitter:developmentCopy head branch name to clipboard

+59-34

Commits

Commits on Jun 3, 2019

• ActiveSupport::Testing::Performance extracted to a gem

  cesswairimu

  committed
  20c81a2

  Copy full SHA for 20c81a2

• ruby prof required as a dependency

  cesswairimu

  committed
  d4131fd

  Copy full SHA for d4131fd

• Configurations update for rails 4.0

  cesswairimu

  committed
  9c21952

  Copy full SHA for 9c21952

• disable rubocop on bin folder

  cesswairimu

  committed
  c4a3cba

  Copy full SHA for c4a3cba

• http patch

  cesswairimu

  committed
  58b80a1

  Copy full SHA for 58b80a1

• Comment out to allow testing

  cesswairimu

  committed
  76d6e33

  Copy full SHA for 76d6e33

• no longer supports plugin loading

  cesswairimu

  committed
  3d7d8ba

  Copy full SHA for 3d7d8ba

• lock to sprockets 2.12

  cesswairimu

  committed
  8b2eaaf

  Copy full SHA for 8b2eaaf

• Active record patches

  cesswairimu

  committed
  ddb6d7c

  Copy full SHA for ddb6d7c

• remove deprecated test syntax

  cesswairimu

  committed
  a79930a

  Copy full SHA for a79930a

• fix failing tests

  cesswairimu

  committed
  a1d0aaf

  Copy full SHA for a1d0aaf

• change new super class

  cesswairimu

  committed
  7cb7a4d

  Copy full SHA for 7cb7a4d

• replace right_aws with right_aws_api

  Show description for 2ef8715
  cesswairimu

  committed
  2ef8715

  Copy full SHA for 2ef8715

• lock to rails 4.2.11.1

  cesswairimu

  committed
  fc838a8

  Copy full SHA for fc838a8

• change rails version in install script

  cesswairimu

  committed
  b5b6340

  Copy full SHA for b5b6340

• remove deprecation warnings

  cesswairimu

  committed
  6dc3a69

  Copy full SHA for 6dc3a69

• make app work

  cesswairimu

  committed
  06f4d00

  Copy full SHA for 06f4d00

• Change test lib to minitest, add minitest reporters

  cesswairimu

  committed
  4db8646

  Copy full SHA for 4db8646

• active record find patches

  cesswairimu

  committed
  6ddb5bc

  Copy full SHA for 6ddb5bc

• root_in_json include defaulted to false

  cesswairimu

  committed
  4f31616

  Copy full SHA for 4f31616

• confirm option removed in link helper

  cesswairimu

  committed
  76e078a

  Copy full SHA for 76e078a

• cookies serializer changed to hybrid

  cesswairimu

  committed
  5d613e8

  Copy full SHA for 5d613e8

• Change render :text to :plain

  Show description for 80e12b7
  cesswairimu

  committed
  80e12b7

  Copy full SHA for 80e12b7

• console for dev web

  cesswairimu

  committed
  01d86fa

  Copy full SHA for 01d86fa

• Check and fix interface functionality

  cesswairimu

  committed
  db6c5fa

  Copy full SHA for db6c5fa

• fix export functionality

  cesswairimu

  committed
  290273f

  Copy full SHA for 290273f

• add protected attributes for the warpable model

  cesswairimu

  committed
  36c9208

  Copy full SHA for 36c9208

• fix image upload

  cesswairimu

  committed
  c53bf27

  Copy full SHA for c53bf27

• Fix comments and images failing tests

  cesswairimu

  committed
  2f23252

  Copy full SHA for 2f23252

Commits on Jun 4, 2019

• include mass assignment security in annotations

  cesswairimu

  committed
  0f76698

  Copy full SHA for 0f76698

• render html for update images

  cesswairimu

  committed
  de27727

  Copy full SHA for de27727

• clear mail array before every test

  cesswairimu

  committed
  685143c

  Copy full SHA for 685143c

Commits on Jun 6, 2019

• Fix codeclimate issues

  cesswairimu

  committed
  74a9ecb

  Copy full SHA for 74a9ecb

Commits on Jun 7, 2019

• skip failing test

  Show description for daac614
  cesswairimu

  committed
  daac614

  Copy full SHA for daac614

• replace unprotected redirects

  cesswairimu

  committed
  528ec09

  Copy full SHA for 528ec09

• Fix codeclimate issues

  cesswairimu

  committed
  1d220ec

  Copy full SHA for 1d220ec

• Autofixing rubocop offenses and Problematic test for #578 (#667)

  Show description for 5bb19c2
  

  alaxalves

  authored and

  cesswairimu

  committed
  5bb19c2

  Copy full SHA for 5bb19c2

• change post test to create since action new is a get action

  cesswairimu

  committed
  11dd71f

  Copy full SHA for 11dd71f

• remove unprotected redirects

  cesswairimu

  committed
  fbb29ba

  Copy full SHA for fbb29ba

• Fix codeclimate issues

  cesswairimu

  committed
  bba8fad

  Copy full SHA for bba8fad

Commits on Jun 10, 2019

• Add yarn

  kaustubh-nair

  committed
  6bc9a8c

  Copy full SHA for 6bc9a8c

• Remove error log

  kaustubh-nair

  committed
  116f385

  Copy full SHA for 116f385

• Fix oauth icons

  kaustubh-nair

  committed
  75c2fef

  Copy full SHA for 75c2fef

• Modify package.json

  kaustubh-nair

  committed
  1f1dedd

  Copy full SHA for 1f1dedd

• Add yarn install to start.sh

  kaustubh-nair

  committed
  f7f526f

  Copy full SHA for f7f526f

• Add leaflet google

  kaustubh-nair

  committed
  68385c3

  Copy full SHA for 68385c3

• Remove leaflet-google from package json

  kaustubh-nair

  committed
  ae88815

  Copy full SHA for ae88815

• remove passenger error logs

  kaustubh-nair

  committed
  49af138

  Copy full SHA for 49af138

• Fix install script

  kaustubh-nair

  committed
  b34dd84

  Copy full SHA for b34dd84

Commits on Jun 11, 2019

• Remove flag

  kaustubh-nair

  committed
  5c0c7c7

  Copy full SHA for 5c0c7c7

• Fix gemfile.lock

  kaustubh-nair

  committed
  22e5312

  Copy full SHA for 22e5312

• Fix gemfile.lock

  kaustubh-nair

  committed
  5da06ce

  Copy full SHA for 5da06ce

• Merge branch 'yarn-bower' into development

  kaustubh-nair

  committed
  2ecc4be

  Copy full SHA for 2ecc4be

• Fix login

  kaustubh-nair

  committed
  d71d9ad

  Copy full SHA for d71d9ad

Commits on Jun 12, 2019

• Upgrade Gemfile to Rails 5.0

  kaustubh-nair

  committed
  1d1211f

  Copy full SHA for 1d1211f

• require rake'

  kaustubh-nair

  committed
  13cdef5

  Copy full SHA for 13cdef5

• Change config files

  kaustubh-nair

  committed
  c20a903

  Copy full SHA for c20a903

• Add application record

  kaustubh-nair

  committed
  5a28772

  Copy full SHA for 5a28772

• Bump mysql

  kaustubh-nair

  committed
  df7b02f

  Copy full SHA for df7b02f

Commits on Jun 13, 2019

• Local builds for Travis runners (#672)

  Show description for 1c1e2c2
  alaxalves

  authored
  1c1e2c2

  Copy full SHA for 1c1e2c2

• Merge branch 'development' of https://github.com/publiclab/mapknitter into rails-5

  alaxalves

  committed
  3385812

  Copy full SHA for 3385812

• Test yarn for travis

  kaustubh-nair

  committed
  4cd47a4

  Copy full SHA for 4cd47a4

• Conditionalize rake db:setup for travis

  kaustubh-nair

  committed
  f0297dd

  Copy full SHA for f0297dd

• Add semicolon

  kaustubh-nair

  committed
  40ad993

  Copy full SHA for 40ad993

• Remove comment

  kaustubh-nair

  committed
  91d082f

  Copy full SHA for 91d082f

• modify database.yml

  kaustubh-nair

  committed
  0607a4f

  Copy full SHA for 0607a4f

• Migrate seperately

  kaustubh-nair

  committed
  a3e7ff8

  Copy full SHA for a3e7ff8

• Run create only for production

  kaustubh-nair

  committed
  525eb1a

  Copy full SHA for 525eb1a

• Locking newer Rails v

  alaxalves

  committed
  4fb5be3

  Copy full SHA for 4fb5be3

• Running update task

  alaxalves

  committed
  d058ce3

  Copy full SHA for d058ce3

• Adding missing bootsnap gem

  alaxalves

  committed
  d90db0e

  Copy full SHA for d90db0e

• Merge branch 'development' of https://github.com/publiclab/mapknitter into rails-5

  alaxalves

  committed
  6e28143

  Copy full SHA for 6e28143

• Fixing missing database

  alaxalves

  committed
  6545537

  Copy full SHA for 6545537

• Adding missing listen gem

  alaxalves

  committed
  24bd1f7

  Copy full SHA for 24bd1f7

• Fixing schema example version

  alaxalves

  committed
  e60bb83

  Copy full SHA for e60bb83

• Fixing migration versions

  alaxalves

  committed
  6bedcc1

  Copy full SHA for 6bedcc1

Commits on Jun 16, 2019

• Fix conflicts

  kaustubh-nair

  committed
  642beb4

  Copy full SHA for 642beb4

Commits on Jun 19, 2019

• Updating dependencies for Rails 5

  alaxalves

  committed
  2c746c1

  Copy full SHA for 2c746c1

• Adding ApplicationMailer abstraction

  alaxalves

  committed
  88b3c8a

  Copy full SHA for 88b3c8a

• Adding required initializers

  alaxalves

  committed
  17f8e88

  Copy full SHA for 17f8e88

• Prefer require_relative instead of full path

  alaxalves

  committed
  463fd8d

  Copy full SHA for 463fd8d

• Making associations not required by default

  alaxalves

  committed
  154f8b5

  Copy full SHA for 154f8b5

• Merge branch 'development' of https://github.com/publiclab/mapknitter into rails-5

  alaxalves

  committed
  c9e8b1b

  Copy full SHA for c9e8b1b

• Regenerating schema file

  alaxalves

  committed
  bccec1b

  Copy full SHA for bccec1b

• Hotfixing MassAssigment

  alaxalves

  committed
  f678d95

  Copy full SHA for f678d95

Commits on Jun 20, 2019

• Upgrade web-console, remove mysql adapter override

  kaustubh-nair

  committed
  f39d468

  Copy full SHA for f39d468

• Remove attr_accessible

  kaustubh-nair

  committed
  c1837f1

  Copy full SHA for c1837f1

• Add rails-controller-testing gem

  kaustubh-nair

  committed
  cfca3ce

  Copy full SHA for cfca3ce

• Follow new syntax for tests

  kaustubh-nair

  committed
  47ce35a

  Copy full SHA for 47ce35a

• Fix conflicts

  kaustubh-nair

  committed
  10cec89

  Copy full SHA for 10cec89

• Remove extra web-console from gemfile

  kaustubh-nair

  committed
  ca9a118

  Copy full SHA for ca9a118

Commits on Jun 21, 2019

• Regenerating lock file

  alaxalves

  committed
  d86282c

  Copy full SHA for d86282c

• Fixing rubocop offenses and bundler version

  alaxalves

  committed
  616f1fe

  Copy full SHA for 616f1fe

• Using correct Paperclip class as in rails/rails#26404 (comment)

  alaxalves

  committed
  2495a8a

  Copy full SHA for 2495a8a

Commits on Jun 25, 2019

• Fix images functional tests

  kaustubh-nair

  committed
  b2fdaea

  Copy full SHA for b2fdaea

• images controller test typecast to string

  kaustubh-nair

  committed
  03bcfd3

  Copy full SHA for 03bcfd3

• Fix rails logger

  kaustubh-nair

  committed
  672fabd

  Copy full SHA for 672fabd

• Fix map tests

  kaustubh-nair

  committed
  a146edb

  Copy full SHA for a146edb

Commits on Jun 27, 2019

• Bumping rubocop version

  alaxalves

  committed
  3a10c73

  Copy full SHA for 3a10c73

• Autofixing rubocop offenses

  alaxalves

  committed
  e2e17e5

  Copy full SHA for e2e17e5

• Including performance cop to rubocop

  alaxalves

  committed
  1340e4d

  Copy full SHA for 1340e4d

• Refactoring deprecated routing and secret_token

  alaxalves

  committed
  37efb69

  Copy full SHA for 37efb69

• Fixing routes for feed controller

  alaxalves

  committed
  d81e8e0

  Copy full SHA for d81e8e0

• Using correct routes for RSS builder

  alaxalves

  committed
  87bb313

  Copy full SHA for 87bb313

Commits on Jun 28, 2019

• Fixing missing routes

  alaxalves

  committed
  a5726c7

  Copy full SHA for a5726c7

• Fixing travis bundler and yarn cache

  alaxalves

  committed
  b0b1dc0

  Copy full SHA for b0b1dc0

Commits on Jun 29, 2019

• Fixing bundle path

  alaxalves

  committed
  6cfd543

  Copy full SHA for 6cfd543

• Splitting bundle and yarn verifications

  alaxalves

  committed
  4fa14f2

  Copy full SHA for 4fa14f2

Commits on Jul 2, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  b40bebd

  Copy full SHA for b40bebd

• Autofixing rubocop offenses

  alaxalves

  committed
  d5ed24a

  Copy full SHA for d5ed24a

• Merge branch 'development' of https://github.com/publiclab/mapknitter into rails-5

  alaxalves

  committed
  5db0ac9

  Copy full SHA for 5db0ac9

Commits on Jul 3, 2019

• Fixing prod host for travis, private class usage and rubocop offenses

  alaxalves

  committed
  6cf32f7

  Copy full SHA for 6cf32f7

• Merge branch 'development' of https://github.com/publiclab/mapknitter into rails-5

  alaxalves

  committed
  8512b65

  Copy full SHA for 8512b65

• Upgrade to Rails 5.2 (#685)

  Show description for 18436ae
  

  kaustubh-nair

  authored and

  alaxalves

  committed
  18436ae

  Copy full SHA for 18436ae

• Merge branch 'rails-5' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  3f12c76

  Copy full SHA for 3f12c76

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  e67ed3b

  Copy full SHA for e67ed3b

• Enforcing params usage on get method

  alaxalves

  committed
  297bcb0

  Copy full SHA for 297bcb0

• Using correct folder names to Rails >5 conventions

  alaxalves

  committed
  e3f3c9d

  Copy full SHA for e3f3c9d

Commits on Jul 6, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  3291e16

  Copy full SHA for 3291e16

• Enforcing params wrapping and adding missing front_ui route

  alaxalves

  committed
  553d8ea

  Copy full SHA for 553d8ea

Commits on Jul 11, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  85f54a5

  Copy full SHA for 85f54a5

• Precompiling assets before serving

  alaxalves

  committed
  3b1f578

  Copy full SHA for 3b1f578

Commits on Jul 12, 2019

• Improving Jenkins startup script

  alaxalves

  committed
  b57356d

  Copy full SHA for b57356d

Commits on Jul 15, 2019

• Using supported docker yaml version by Jenkins

  alaxalves

  committed
  63b0a89

  Copy full SHA for 63b0a89

• Adding task to check database existance

  alaxalves

  committed
  5678f71

  Copy full SHA for 5678f71

• Improving start script

  alaxalves

  committed
  43d86e1

  Copy full SHA for 43d86e1

• Improving Makefile's recipes and target

  alaxalves

  committed
  658d4ea

  Copy full SHA for 658d4ea

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  0c685d1

  Copy full SHA for 0c685d1

• Adding task to check database existance

  alaxalves

  committed
  1c61d3a

  Copy full SHA for 1c61d3a

• Improving start script

  alaxalves

  committed
  381704c

  Copy full SHA for 381704c

• Improving Makefile's recipes and target

  alaxalves

  committed
  85bb1eb

  Copy full SHA for 85bb1eb

• Improving Makefile's recipes and target

  alaxalves

  committed
  431164d

  Copy full SHA for 431164d

• Merge branch 'development' of https://github.com/publiclab/mapknitter into fix-missing-steps-jenkins

  alaxalves

  committed
  63c6a59

  Copy full SHA for 63c6a59

Commits on Jul 16, 2019

• Merge branch 'fix-missing-steps-jenkins' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  2abced6

  Copy full SHA for 2abced6

Commits on Jul 17, 2019

• Patching #803

  alaxalves

  committed
  8d85686

  Copy full SHA for 8d85686

• Improving Jenkins setup

  alaxalves

  committed
  d91554e

  Copy full SHA for d91554e

Commits on Jul 20, 2019

• Fix map loading

  kaustubh-nair

  committed
  f4005d0

  Copy full SHA for f4005d0

Commits on Jul 22, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  9d7267d

  Copy full SHA for 9d7267d

Commits on Jul 25, 2019

• h

  sashadev-sky

  committed
  58bc692

  Copy full SHA for 58bc692

Commits on Jul 26, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  f8d2b8d

  Copy full SHA for f8d2b8d

• Fixing Leaflet-Environmental-Layers map loading

  alaxalves

  committed
  bf66f69

  Copy full SHA for bf66f69

• h

  sashadev-sky

  committed
  997a6fa

  Copy full SHA for 997a6fa

• leaflet

  sashadev-sky

  committed
  ab615b5

  Copy full SHA for ab615b5

• fix

  sashadev-sky

  committed
  3dd385a

  Copy full SHA for 3dd385a

• change

  sashadev-sky

  committed
  c785c63

  Copy full SHA for c785c63

• updates

  sashadev-sky

  committed
  cc22333

  Copy full SHA for cc22333

• stop precompiling assets

  sashadev-sky

  committed
  81d496f

  Copy full SHA for 81d496f

• precompile

  sashadev-sky

  committed
  4cb16b0

  Copy full SHA for 4cb16b0

• Merge branch 'lfix' of https://github.com/sashadev-sky/mapknitter into testing-sasha-hotfix

  alaxalves

  committed
  1fbba3a

  Copy full SHA for 1fbba3a

Commits on Jul 29, 2019

• Using correct Yarn, NPM and Node version, avoiding mismatch

  alaxalves

  committed
  ccafe26

  Copy full SHA for ccafe26

• Removing unwanted tags.js invocation

  alaxalves

  committed
  b80b315

  Copy full SHA for b80b315

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  85f1b3c

  Copy full SHA for 85f1b3c

Commits on Jul 30, 2019

• Improving Makefile recipe

  alaxalves

  committed
  2d12491

  Copy full SHA for 2d12491

• Merge branch 'development' of https://github.com/publiclab/mapknitter into testing-sasha-hotfix

  alaxalves

  committed
  906beb3

  Copy full SHA for 906beb3

• Using node_modules/ as dependencies folder, since sass/node-sass#2050 (comment)

  alaxalves

  committed
  552fc70

  Copy full SHA for 552fc70

• Upgrading Yarn dependencies

  alaxalves

  committed
  2773d0e

  Copy full SHA for 2773d0e

• Removing duplicate rubocop directive

  alaxalves

  committed
  15369b4

  Copy full SHA for 15369b4

• Removing test/ from codeclimate checks

  alaxalves

  committed
  41a0c3e

  Copy full SHA for 41a0c3e

• Removing fixed FIXME comments

  alaxalves

  committed
  4d2c947

  Copy full SHA for 4d2c947

• Removing fixed FIXME comments

  alaxalves

  committed
  0970e84

  Copy full SHA for 0970e84

• Merge branch 'development' of https://github.com/publiclab/mapknitter into rails-5

  alaxalves

  committed
  de5774b

  Copy full SHA for de5774b

• Updating docs in README

  alaxalves

  committed
  2211dc4

  Copy full SHA for 2211dc4

Commits on Aug 2, 2019

• Bumping recaptcha and include methods

  alaxalves

  committed
  ca0c2fc

  Copy full SHA for ca0c2fc

Commits on Aug 6, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  98a6ca7

  Copy full SHA for 98a6ca7

• Fixing migration version

  alaxalves

  committed
  74b75ca

  Copy full SHA for 74b75ca

• Using strong params in requests

  alaxalves

  committed
  0148e7a

  Copy full SHA for 0148e7a

Commits on Aug 10, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  kaustubh-nair

  committed
  df2f8f1

  Copy full SHA for df2f8f1

• Use Rack::Test::UploadedFile instead of ActionDispatch::Http::UploadedFile

  kaustubh-nair

  committed
  6b59103

  Copy full SHA for 6b59103

Commits on Aug 15, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  kaustubh-nair

  committed
  3f09e8d

  Copy full SHA for 3f09e8d

• Fix minor asset issue

  kaustubh-nair

  committed
  a1fe6ad

  Copy full SHA for a1fe6ad

• Remove manual asset references and add them to application js

  kaustubh-nair

  committed
  a900b99

  Copy full SHA for a900b99

• Fix asset ordering in application.js

  kaustubh-nair

  committed
  0a18f29

  Copy full SHA for 0a18f29

• Configure System tests (#936)

  Show description for ad142c5
  

  kaustubh-nair

  authored and

  jywarren

  committed
  ad142c5

  Copy full SHA for ad142c5

Commits on Aug 16, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  cacf26d

  Copy full SHA for cacf26d

Commits on Aug 20, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  87e18ee

  Copy full SHA for 87e18ee

Commits on Aug 21, 2019

• action cable setup (#805)

  Show description for 843a719
  

  ViditChitkara

  authored and

  alaxalves

  committed
  843a719

  Copy full SHA for 843a719

• Fixing CodeClimate issues

  alaxalves

  committed
  f78cbc9

  Copy full SHA for f78cbc9

Commits on Aug 23, 2019

• Synch editing add ons (#957)

  Show description for 1627b96
  

  ViditChitkara

  authored and

  jywarren

  committed
  1627b96

  Copy full SHA for 1627b96

Commits on Oct 3, 2019

• Merge branch 'main' of https://github.com/publiclab/mapknitter into development

  alaxalves

  committed
  cacf446

  Copy full SHA for cacf446