babka/babka-social-blog
2
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

Dev #42

Merged
vosaul merged 7 commits from dev into main 2022-06-24 21:59:16 +00:00
Conversation 6 Commits 7 Files changed 2 +97 -1
vosaul commented 2022-06-24 12:39:16 +00:00 (Migrated from gitlab.com)
Copy link

resolved #8
Fix header logo link to the root of the site

resolved #8 Fix header logo link to the root of the site
vosaul commented 2022-06-24 12:39:17 +00:00 (Migrated from gitlab.com)
Copy link

assigned to @vosaul

assigned to @vosaul
emacsen commented 2022-06-24 14:01:35 +00:00 (Migrated from gitlab.com)
Copy link

Before I approve this, can you make a few fixes to it.

First, the gitlab config (which I guess we're using for previewing?) has a config that's different/distinct from the regular _config.yml, which means the site will be different. Can you please fix that and re-submit the merge request?

Also, while I'll just accept this, in the future, it's much easier for both you and I if you use a feature branch.

If you're unfamiliar with the feature branch workflow, it means you create a separate branch for the specific issue you're addressing, then it gets deleted when the pull/merge request is accepted.

https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow

This way we can all work in parallel.

Before I approve this, can you make a few fixes to it. First, the gitlab config (which I guess we're using for previewing?) has a config that's different/distinct from the regular `_config.yml`, which means the site will be different. Can you please fix that and re-submit the merge request? Also, while I'll just accept this, in the future, it's much easier for both you and I if you use a feature branch. If you're unfamiliar with the feature branch workflow, it means you create a separate branch for the specific issue you're addressing, then it gets deleted when the pull/merge request is accepted. https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow This way we can all work in parallel.
vosaul commented 2022-06-24 20:17:12 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>8d679385 - Sync _config.yml</li></ul> [Compare with previous version](/babka_social/babka-social-blog/-/merge_requests/6/diffs?diff_id=424560527&start_sha=1e8061ee72e8304c570f529c1890b611cc1c865d)
vosaul commented 2022-06-24 20:17:43 +00:00 (Migrated from gitlab.com)
Copy link

First, the gitlab config (which I guess we're using for previewing?) Has a config that's different / distinct from the regular _config.yml, which means the site will be different.

I created _gitlab-config.yml so that the preview did not differ from the main site, the configs differed only in one line: baseurl: "/ babka-social-blog". Styles, scripts, images will not be loaded without this adjustment

If you're unfamiliar with the branch workflow feature, it means you create a separate branch for the specific issue you're addressing, then it gets deleted when the pull / merge request is accepted.

You are right. I usually work that way.

Just in case, I overwrote _gitlab-config.yml with the _config.yml file, leaving only the baseurl for the preview.

> First, the gitlab config (which I guess we're using for previewing?) Has a config that's different / distinct from the regular _config.yml, which means the site will be different. I created _gitlab-config.yml so that the preview did not differ from the main site, the configs differed only in one line: baseurl: "/ babka-social-blog". Styles, scripts, images will not be loaded without this adjustment > If you're unfamiliar with the branch workflow feature, it means you create a separate branch for the specific issue you're addressing, then it gets deleted when the pull / merge request is accepted. You are right. I usually work that way. Just in case, I overwrote _gitlab-config.yml with the _config.yml file, leaving only the baseurl for the preview.
emacsen commented 2022-06-24 21:59:16 +00:00 (Migrated from gitlab.com)
Copy link

mentioned in commit a7c4584645

mentioned in commit a7c4584645a7b74c7d8302161fc8f8a32ccbf5d2
emacsen (Migrated from gitlab.com) merged commit a7c4584645 into main 2022-06-24 21:59:17 +00:00
emacsen commented 2022-06-24 21:59:23 +00:00 (Migrated from gitlab.com)
Copy link

I'll accept this for now, but I'll open up a new ticket for us to use an include file in the gitlab config.

https://docs.gitlab.com/ee/ci/yaml/includes.html

I'll accept this for now, but I'll open up a new ticket for us to use an include file in the gitlab config. https://docs.gitlab.com/ee/ci/yaml/includes.html
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Critical

   
Important

   
Low

   
Normal
No labels
Critical
Important
Low
Normal
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
babka/babka-social-blog!42
No description provided.