| [11:11:53] | * Yaazkal has quit (Quit: Connection closed for inactivity) |
| [16:49:34] | * hefri426 has joined #aegir |
| [16:49:44] | * anarchat has joined #aegir |
| [16:53:35] | * hefring has quit (Disconnected by services) |
| [16:53:35] | * hefri426 is now known as hefri135 |
| [16:54:37] | * anarcat has quit (Ping timeout: 245 seconds) |
| [16:58:35] | * hefri135 is now known as hefring |
| [22:04:48] | * gusaus[m] has left #aegir ("Kicked by @appservice-irc:matrix.org : 30 day idle timeout.") |
| [22:19:48] | * ricardoamaro_ has quit (Quit: 30 day idle timeout.) |
| [22:22:49] | * sher1harris[m] has quit (Quit: 30 day idle timeout.) |
| [22:23:22] | * shaneonabike has joined #aegir |
| [01:04:53] | * shaneonabike has left #aegir () |
| [01:33:49] | <jonpugh[m]> | helmo: is it possible you have been pushing some things to gitlab but not git.drupal.org? |
| [01:34:12] | <jonpugh[m]> | A couple of times I've seen branches where the code is the same as 7.x-3.x but the branch still has unmerged commits |
| [01:34:20] | <jonpugh[m]> | oh, are we squashing now? |
| [01:34:22] | <helmo42[m]> | Hmm ... should not ... but not impossibe ;( |
| [01:34:46] | <jonpugh[m]> | Are there MRs being merged on gitlab.com? |
| [01:35:09] | <helmo42[m]> | I don't normally use squash |
| [01:35:44] | <helmo42[m]> | https://gitlab.com/aegir/provision/merge_requests is empty ... |
| [01:35:56] | <helmo42[m]> | only in the documentation repo I think |
| [01:36:28] | <jonpugh[m]> | ok |
| [01:36:34] | <jonpugh[m]> | I see it is mirroring |
| [01:36:52] | <jonpugh[m]> | test message from "IRC" room? |
| [01:37:06] | * jonpugh[m] has left #aegir ("User left") |
| [01:37:17] | * jonpugh[m] has joined #aegir |
| [01:37:17] | <jonpugh[m]> | cool... |
| [01:37:47] | <jonpugh[m]> | yeah, helmo git.drupal and gitlab.com are out of sync |
| [01:38:05] | <jonpugh[m]> | more commits but less branches on git.drupal.org |
| [01:38:09] | <jonpugh[m]> | for provision anyway |
| [01:38:53] | <helmo42[m]> | I see that I missed pushing the 3.18.x bracnh ... which I shoudl merge back anyway ... will do now. |
| [01:38:54] | <jonpugh[m]> | lol there's an extra 1.3 MB of files in gitlab too |
| [01:39:14] | <jonpugh[m]> | https://gitlab.com/aegir/provision has 146 branches |
| [01:39:25] | <jonpugh[m]> | https://git.drupalcode.org/project/provision only has 127 :D |
| [01:40:02] | * anarchat is now known as anarcat |
| [01:40:19] | <jonpugh[m]> | oh right |
| [01:40:26] | <jonpugh[m]> | I deleted a bunch of branches |
| [01:40:48] | <helmo42[m]> | Yay ... a lot of them must be stale |
| [01:42:11] | <helmo42[m]> | 7.x-3.18.x is now merged |
| [01:44:29] | <jonpugh[m]> | helmo42: Check out this example: https://git.drupalcode.org/project/provision/compare/7.x-3.x...2957156-c... |
| [01:44:30] | <jonpugh[m]> | Branch compare shows unmerged code AND commits |
| [01:44:40] | <jonpugh[m]> | but the issue is marked fixefd |
| [01:44:40] | <jonpugh[m]> | https://www.drupal.org/node/2957156 |
| [01:44:41] | <hefring> | https://www.drupal.org/node/2957156 => Convert Provision to include ClassLoader using composer.json and autoloader.php. [#2957156] => 18 comments, 1 IRC mention |
| [01:46:27] | <jonpugh[m]> | 7.x-3.x definitely has those changes though |
| [01:47:21] | <jonpugh[m]> | This commit https://git.drupalcode.org/project/provision/commit/818f0721ae5a398fb3fc... |
| [01:48:09] | <jonpugh[m]> | oh i see |
| [01:48:10] | <jonpugh[m]> | that was a mistake commit |
| [01:48:11] | <jonpugh[m]> | here's the one you merged https://git.drupalcode.org/project/provision/commit/7ed4fb8e79f1ef54d65d... |
| [01:48:53] | <helmo42[m]> | ah... time to purge that branch :) |
| [01:49:06] | <jonpugh[m]> | 💥 |
| [01:49:09] | <jonpugh[m]> | just deleted |
| [01:54:08] | <jonpugh[m]> | helmo42: can you review this unmerged change: https://www.drupal.org/node/2960825 |
| [01:54:10] | <hefring> | https://www.drupal.org/node/2960825 => Add apache/nginx config to mitigate SA-CORE-2018-002 [#2960825] => 20 comments, 1 IRC mention |
| [01:54:25] | <jonpugh[m]> | https://www.drupal.org/project/provision/issues/2960825#comment-13305528 |
| [01:54:27] | <hefring> | https://www.drupal.org/project/provision/issues/2960825 => Add apache/nginx config to mitigate SA-CORE-2018-002 [#2960825] => 20 comments, 6 IRC mentions |
| [01:54:55] | <helmo42[m]> | ok |
| [02:01:38] | <helmo42[m]> | I don;t understand why D.o only shows two changes there ... |
| [02:02:00] | <helmo42[m]> | 'git diff origin/7.x-3.x...origin/2960825-mitigation' gives me much more ... it seems we did not merge that branch |
| [07:31:29] | * calbasi has quit (Quit: Leaving) |
