From 976181117c8f5fa6a0e2dfa6c189bf2371f53f25 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 13:59:22 +0000 Subject: [PATCH 1/10] Add question regarding logged in user membership --- diff --git a/docs/faq.rst b/docs/faq.rst index da31069..be7539e 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -6,9 +6,21 @@ This page contains frequently asked questions about fedora-happiness-packets. It includes troubleshooting steps and other project details. +<<<<<<< HEAD ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it running? Verify the logged in user is member of the docker group. To verify logged in user run:: +======= +ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it running? + Verify the logged in user is member of the docker group. + To verify logged in user run:: + + sudo usermod -aG docker ${USER} + + If logged in user is not member of the docker group add it using:: + + sudo gpasswd -a${USER} +>>>>>>> Add question regarding logged in user membership sudo usermod -aG docker ${USER} From c7cb03bf11f2a87f04f44f026cce3e2dace23df9 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 13:59:22 +0000 Subject: [PATCH 2/10] Register models to Django Admin --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py new file mode 100755 index 0000000..45e2ad3 --- /dev/null +++ b/happinesspackets/messaging/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from happinesspackets.messaging.models import Message, BlacklistedEmail + +admin.site.register(Message) +admin.site.register(BlacklistedEmail) \ No newline at end of file From f0bb04c8789bc69e2fb6cfabf19dcbdcf89726ae Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:00:10 +0000 Subject: [PATCH 3/10] Revert "Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets" This reverts commit 2f198d890974a9c5c377bbfcb285ec8539e47594, reversing changes made to 5e3403fef50cc75bc5bfdd815d06e647caa745a7. --- diff --git a/docs/setup/development_windows.rst b/docs/setup/development_windows.rst index c513f10..d582fe1 100644 --- a/docs/setup/development_windows.rst +++ b/docs/setup/development_windows.rst @@ -23,8 +23,13 @@ You will need the following programs installed on your system before proceeding Setting up the development environment ======================================== +<<<<<<< HEAD #. Fork the `current repository `_ to your profile. #. Clone this forked repository (ssh method is recommended, the steps can be found `here `_) to your system using Git with the following command:: +======= +#. Fork the `current repository `_ to your profile . +#. Clone this forked repository to your system using Git with the following command:: +>>>>>>> Revert "Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets" git clone "https://pagure.io/forks//fedora-commops/fedora-happiness-packets.git" @@ -78,12 +83,11 @@ In order to run tests, make sure to execute ``docker-compose up`` command. Now i docker-compose exec web sh Then the terminal will show a ``#`` symbol. -Simply type in ``./t`` (or ``t``) to initiate the test suite. +Simply type in ``t`` to initiate the test suite. -(The test suite are run by running the ``./t`` script, which runs the tests with the appropriate testing settings and provides a coverage report.) +(The test suite are run by running the ``t`` script, which runs the tests with the appropriate testing settings and provides a coverage report.) Integration tests are run via the following command:: - docker-compose exec web ./manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting + manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting -If a ``file not found`` error occurs, try removing the ``./`` from the command and try again. From 2448ce2f0e724d7638feacd0c0693e1ed20d7307 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:00:10 +0000 Subject: [PATCH 4/10] Add new line at the eof --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py index 45e2ad3..d7d13cd 100755 --- a/happinesspackets/messaging/admin.py +++ b/happinesspackets/messaging/admin.py @@ -2,4 +2,4 @@ from django.contrib import admin from happinesspackets.messaging.models import Message, BlacklistedEmail admin.site.register(Message) -admin.site.register(BlacklistedEmail) \ No newline at end of file +admin.site.register(BlacklistedEmail) From 0f15bb4c34314ac3c2c84448003422762d2f9db2 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:00:10 +0000 Subject: [PATCH 5/10] Revert "Add new line at the eof" This reverts commit 4821749af12e8565868160a03964f6f7ccdfa302. --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py index d7d13cd..45e2ad3 100755 --- a/happinesspackets/messaging/admin.py +++ b/happinesspackets/messaging/admin.py @@ -2,4 +2,4 @@ from django.contrib import admin from happinesspackets.messaging.models import Message, BlacklistedEmail admin.site.register(Message) -admin.site.register(BlacklistedEmail) +admin.site.register(BlacklistedEmail) \ No newline at end of file From e9064895159904bc3c55fbe7a7b3e5d0643ba214 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:00:10 +0000 Subject: [PATCH 6/10] Revert "Register models to Django Admin" This reverts commit a7896d86d61f068b7e35b9c8c8696a2f348592f4. --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py deleted file mode 100755 index 45e2ad3..0000000 --- a/happinesspackets/messaging/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin -from happinesspackets.messaging.models import Message, BlacklistedEmail - -admin.site.register(Message) -admin.site.register(BlacklistedEmail) \ No newline at end of file From e08ece9e109a86cf744345ff3de1039fadc3abb9 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:00:10 +0000 Subject: [PATCH 7/10] Register models in django admin --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py new file mode 100755 index 0000000..d7d13cd --- /dev/null +++ b/happinesspackets/messaging/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from happinesspackets.messaging.models import Message, BlacklistedEmail + +admin.site.register(Message) +admin.site.register(BlacklistedEmail) From 7c8e3caa90aeaa03514f18af6f0e4a3048e2554f Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:19:49 +0000 Subject: [PATCH 8/10] Resolve conflict in docs/faq.rst --- diff --git a/docs/faq.rst b/docs/faq.rst old mode 100644 new mode 100755 index be7539e..1cef1d7 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -6,11 +6,6 @@ This page contains frequently asked questions about fedora-happiness-packets. It includes troubleshooting steps and other project details. -<<<<<<< HEAD -ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it running? - Verify the logged in user is member of the docker group. - To verify logged in user run:: -======= ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it running? Verify the logged in user is member of the docker group. To verify logged in user run:: @@ -20,7 +15,7 @@ ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it runnin If logged in user is not member of the docker group add it using:: sudo gpasswd -a${USER} ->>>>>>> Add question regarding logged in user membership + sudo usermod -aG docker ${USER} From 5704a943980327efe03615229a7715e33ebc8fad Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:23:19 +0000 Subject: [PATCH 9/10] Revert "Register models in django admin" This reverts commit e08ece9e109a86cf744345ff3de1039fadc3abb9. --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py deleted file mode 100755 index d7d13cd..0000000 --- a/happinesspackets/messaging/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin -from happinesspackets.messaging.models import Message, BlacklistedEmail - -admin.site.register(Message) -admin.site.register(BlacklistedEmail) From a6dc207a20fde6ff7bcd75a451da2bed80b5640d Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 14 2019 14:47:26 +0000 Subject: [PATCH 10/10] Resolving conflict in docs/faq.rst --- diff --git a/docs/faq.rst b/docs/faq.rst index 1cef1d7..af0b8f2 100755 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -10,18 +10,11 @@ ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it runnin Verify the logged in user is member of the docker group. To verify logged in user run:: - sudo usermod -aG docker ${USER} + sudo usermod -aG docker ${USER} If logged in user is not member of the docker group add it using:: - sudo gpasswd -a${USER} - - - sudo usermod -aG docker ${USER} - - If logged in user is not member of the docker group add it using:: - - sudo gpasswd -a${USER} + sudo gpasswd -a${USER} No sample messages on the main page and no messages in Archives, even though both sender and receiver approved to display message publicily.