Commits · cfeedcf943be7e5f02461056abed7c974f308c7e · red-group-test / red-ci-cd

19 Feb, 2020 27 commits
- Merge branch 'prod-dev-gladys' into 'product-dev' · cfeedcf9
  Gladys Forte authored Feb 19, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!832
```
  cfeedcf9
- {dev bugfix} 002 migration for cms settings · 148a8a50
  Gladys Forte authored Feb 19, 2020
  
  148a8a50
- Merge branch 'product-dev' of... · 9bee00cb
  Gladys Forte authored Feb 19, 2020
```
Merge branch 'product-dev' of http://54.169.104.100:27015/rms/Backend/api-main-service into prod-dev-gladys
```
  9bee00cb
- Merge branch 'core-demo' into 'product-dev' · 17cae1b6
  John Red Medrano authored Feb 19, 2020
```
Core demo

See merge request rms/Backend/api-main-service!830
```
  17cae1b6
- Merge branch 'core-staging' into 'core-demo' · 11bc9b8a
  John Red Medrano authored Feb 19, 2020
```
Core staging

See merge request rms/Backend/api-main-service!829
```
  11bc9b8a
- Merge branch 'core-sit' into 'core-staging' · 536b83f1
  John Red Medrano authored Feb 19, 2020
```
Core sit

See merge request rms/Backend/api-main-service!828
```
  536b83f1
- Merge branch 'core-dev' into 'core-sit' · d5019551
  John Red Medrano authored Feb 19, 2020
```
Core dev

See merge request rms/Backend/api-main-service!827
```
  d5019551
- Merge branch 'product-dev' of... · 771857e9
  Gladys Forte authored Feb 19, 2020
```
Merge branch 'product-dev' of http://54.169.104.100:27015/rms/Backend/api-main-service into prod-dev-gladys
```
  771857e9
- Merge branch 'core-dev-gladys' into 'core-dev' · cc753e8a
  Gladys Forte authored Feb 19, 2020
```
{dev bugfix} migrations

See merge request rms/Backend/api-main-service!825
```
  cc753e8a
- {dev bugfix} migrations · ffcb6704
  Gladys Forte authored Feb 19, 2020
  
  ffcb6704
- Merge branch 'core-demo' into 'product-dev' · 6d3661e4
  John Red Medrano authored Feb 19, 2020
```
Core demo

See merge request rms/Backend/api-main-service!823
```
  6d3661e4
- fixing · e6e38ff1
  John Red Medrano authored Feb 19, 2020
  
  e6e38ff1
- testing: · 0a614579
  John Red Medrano authored Feb 19, 2020
  
  0a614579
- Merge branch 'core-staging' into 'core-demo' · f09d2d68
  John Red Medrano authored Feb 19, 2020
```
Core staging

See merge request rms/Backend/api-main-service!821
```
  f09d2d68
- Merge branch 'core-sit' into 'core-staging' · a906c3e0
  John Red Medrano authored Feb 19, 2020
```
Core sit

See merge request rms/Backend/api-main-service!820
```
  a906c3e0
- Merge branch 'core-dev' into 'core-sit' · aaf7ff2c
  John Red Medrano authored Feb 19, 2020
```
Core dev

See merge request rms/Backend/api-main-service!819
```
  aaf7ff2c
- Merge branch 'core-dev-gladys' into 'core-dev' · 2a13194d
  Gladys Forte authored Feb 19, 2020
```
{dev bugfix} delete migrations

See merge request rms/Backend/api-main-service!817
```
  2a13194d
- {dev bugfix} delete migrations · dbfc1ea0
  Gladys Forte authored Feb 19, 2020
  
  dbfc1ea0
- {dev bugfix} merge conflict · 17ac62fa
  Gladys Forte authored Feb 19, 2020
  
  17ac62fa
- Merge branch 'core-demo' into 'product-dev' · 13671ffe
  Gladys Forte authored Feb 19, 2020
```
Core demo

See merge request rms/Backend/api-main-service!815
```
  13671ffe
- Merge branch 'core-staging' into 'core-demo' · 3b30b4e4
  Gladys Forte authored Feb 19, 2020
```
Core staging

See merge request rms/Backend/api-main-service!814
```
  3b30b4e4
- Merge branch 'core-sit' into 'core-staging' · 8aa238a8
  Gladys Forte authored Feb 19, 2020
```
Core sit

See merge request rms/Backend/api-main-service!813
```
  8aa238a8
- Merge branch 'core-dev' into 'core-sit' · 6ad13b95
  Gladys Forte authored Feb 19, 2020
```
Core dev

See merge request rms/Backend/api-main-service!812
```
  6ad13b95
- Merge branch 'RMSv2' into 'core-dev' · 991e441c
  Gladys Forte authored Feb 19, 2020
```
Rm sv2

See merge request rms/Backend/api-main-service!811
```
  991e441c
- Merge branch 'core-dev-gladys' into 'RMSv2' · eea1c456
  Gladys Forte authored Feb 19, 2020
```
{dev bugfix} added filter dashboard overdue and awaiting count

See merge request rms/Backend/api-main-service!810
```
  eea1c456
- {dev bugfix} added filter dashboard overdue and awaiting count · e34111be
  Gladys Forte authored Feb 19, 2020
  
  e34111be
- {dev bugfix} added filter for awaiting and overdue dashboard · 22749296
  Gladys Forte authored Feb 19, 2020
  
  22749296
18 Feb, 2020 10 commits
- Merge branch 'prod-dev-gladys' into 'product-dev' · 58cf7c2a
  Gladys Forte authored Feb 18, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!808
```
  58cf7c2a
- {dev bugfix} remove html_obj and html_desc to model · 122a7c58
  Gladys Forte authored Feb 18, 2020
  
  122a7c58
- {dev bugfix} debug=false env template · 620fe440
  Gladys Forte authored Feb 18, 2020
  
  620fe440
- Merge branch 'prod-dev-gladys' into 'product-dev' · ca296b69
  Gladys Forte authored Feb 18, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!806
```
  ca296b69
- {dev bugfix} added debug to config · 46e4e00e
  Gladys Forte authored Feb 18, 2020
  
  46e4e00e
- Merge branch 'prod-dev-gladys' into 'product-dev' · ad697080
  Gladys Forte authored Feb 18, 2020
```
RMS40 – CMS Settings Duplicate User Allowed -...

See merge request rms/Backend/api-main-service!805
```
  ad697080
- Merge branch 'product-dev' of... · c4775ca3
  Gladys Forte authored Feb 18, 2020
```
Merge branch 'product-dev' of http://54.169.104.100:27015/rms/Backend/api-main-service into prod-dev-gladys
```
  c4775ca3
- RMS40 – CMS Settings Duplicate User Allowed -... · e73677eb
  Gladys Forte authored Feb 18, 2020
```
RMS40 – CMS Settings Duplicate User Allowed - http://54.169.104.100:27015/rms/Backend/api-main-service/issues/23 - cms settings not allowing duplcates user
```
  e73677eb
- Merge branch 'red-develop' into 'product-dev' · 285d4927
  John Red Medrano authored Feb 18, 2020
```
Red develop

See merge request rms/Backend/api-main-service!803
```
  285d4927
- {dev bugfix} debugging on rms dashboard · c77b353f
  John Red Medrano authored Feb 18, 2020
  
  c77b353f
11 Feb, 2020 3 commits
- Merge branch 'core-dev-gladys' into 'RMSv2' · dc0d4894
  Gladys Forte authored Feb 11, 2020
```
Core dev gladys

See merge request rms/Backend/api-main-service!799
```
  dc0d4894
- Merge branch 'core-dev-red-develop' into 'RMSv2' · c9bdc297
  Deployment User authored Feb 11, 2020
```
another test for commiting on gitlab

See merge request rms/Backend/api-main-service!798
```
  c9bdc297
- testing gitlab · db8a21c3
  Gladys Forte authored Feb 11, 2020
  
  db8a21c3