Merge request 3 (90f596e4fd8fa291b1da831bce609b486c7a5875 -> fc3d8b1050dfa7e033277769457300a1e10a0be3)
By: anonymous
Against ref: refs/heads/master
Date: 2020-03-16 05:06
This merge request cannot be merged without conflicts.
Conflicts:
changed in both
base 100644 1d838cd930736f74969927b26c4a4a55879a3497 TODO
our 100644 3d09bb1f6b200285fadd33d0d56d2d7fc951f75e TODO
their 100644 b7a03691b690f4c582208cbb2850ba6b6a19bc2c TODO
@@ -190,6 +190,7 @@
Or disable them if admin did not set the correct URL?
Or use the IP address?
Search for php_uname?
+<<<<<<< .our
[ ] Seems I have to move some stuff from 'update' hook to 'post-receive'
because in 'update' we are not sure if update was really made.
Take care of anonymous push.
@@ -237,6 +238,18 @@
Some users may want to use a local instance, but mirror it in the
official rocketgit.com site, for backup purposes.
Should be mirror stuff back?
+=======
+[ ] Resync nginx conf on rg2.
+[ ] worker: have a flag which allows intrnet access?
+ Better to let the owner provide a template which may have or
+ may have not Internet access. Think about private networks! Better
+ with template.
+[ ] worker: allow ssh (root) login only by key, to not be able to become root.
+[ ]
+
+== BEFORE NEXT RELEASE ==
+[ ] Be sure we extract the sid from cookies and not from get/post.
+>>>>>>> .their
[ ] wh: are available for all users? Should we configure this?
Think about a user which has push rights but is not the owner of the project.
[ ] push/etc: show how what IPs are validated with TOTP?
List of commits:
Subject Hash Author Date (UTC)
TODO update 62593069762d6e52a11371cc5f7746163982bef9 Catalin(ux) M. BOIE 2020-03-16 05:05:06
Commit 62593069762d6e52a11371cc5f7746163982bef9 - TODO update
Author: Catalin(ux) M. BOIE
Author date (UTC): 2020-03-16 05:05
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2020-03-16 05:05
Parent(s): 843e17fa05f5f9f8be4e13dc177d3e229431582d
Signing key:
Tree: 1ceadb354afa9f1612a8d98351bf346f2bcc1c9b
File Lines added Lines deleted
TODO 1 0
File TODO changed (mode: 100644) (index 10b597e..b84d27e)
1 1 == Where I stopped last time == == Where I stopped last time ==
2 2
3 3 == BEFORE NEXT RELEASE == == BEFORE NEXT RELEASE ==
4 [ ] Be sure we extract the sid from cookies and not from get/post.
4 5 [ ] Allow more lock/info messages, with prios; [ ] Allow more lock/info messages, with prios;
5 6 add support for background/text colors. add support for background/text colors.
6 7 [ ] We may need a lot of packages in build phase if we want to run the tests. [ ] We may need a lot of packages in build phase if we want to run the tests.
Hints:
How to merge on your machine?
git fetch origin refs/mr/3:mr-3
git checkout master
git merge mr-3

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout master
git merge mr/3