[
https://issues.apache.org/jira/browse/KARAF-5712?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16509331#comment-16509331
]
ASF GitHub Bot commented on KARAF-5712:
---------------------------------------
jbonofre commented on a change in pull request #9: [KARAF-5712] Change
responsive css to Bootstrap
URL: https://github.com/apache/karaf-site/pull/9#discussion_r194651806
##########
File path: src/main/webapp/community.html
##########
@@ -120,82 +166,97 @@ <h3 id="pull-request">Provide changes in a pull
request</h3>
<li>You can squash your commits into one and force push
your branch (not mandatory) using <code>git rebase -i apache/master</code></li>
<li>Test that your change works by adapting or adding
tests.</li>
<li><a
href="http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule";>Follow
the boy scout rule to "Always leave the campground cleaner than you found
it."</a></li>
- <li>Make sure you do a build before doing a PR. The build
has to be successfull:<br/>
- <code>
+ <li>Make sure you do a build before doing a PR. The build
has to be successfull :<br/>
+ <code>
mvn clean verify -Prelease -fae -T 1C
- </code>
- </li>
+ </code>
+ </li>
<li>If your PR has conflicts with the master then rebase
the branch. PRs with conflicts are unlikely to be applied</li>
<li>Do not change too much in a PR. The smaller the PR the
easier it is to apply and the faster it will be done</li>
<li>Sometimes PRs get lost. Do not hesitate to ask on the
dev list if your PR seems to be ignored</li>
- </ul>
-
- <div class="content--panel--separator"></div>
+ </ul>
+ </div>
+ </div>
- <h3 id="review-pull-request">Review pull requests</h3>
-
- Anyone can review pull requests but the merge can be done only
by a committer.<br/>
+ <div class="row mb-5 mt-5">
+ <div class="col">
+ <h4 class="pb-3 mb-4">Review pull requests</h4>
+ <p>Anyone can review pull requests but the merge can be done
only by a committer.<br/>
If you want to review a PR then comment with
<code>R:@yourgithubid</code>. This marks that you will do the review and also
apply if you are a committer.<br/>
- When reviewing check if the changes are done in a clean way
and are tested with a unit and possibly integration test. Check that the build
does not report more test failures than before. If you are not a committer then
write a comment if you recommend a merge or not. Provide good instructions for
the contributor how to improve his PR if it is not yet ok. Make sure you do a
review timely. By commenting that you do a review you kind of block others from
applying the change.<br/>
+ When reviewing check if the changes are done in a clean way
and are tested with a unit and possibly integration test. Check that the build
does not report more test failures than before. If you are not a committer then
write a comment if you recommend a merge or not. Provide good instructions for
the contributor how to improve his PR if it is not yet ok. Make sure you do a
review timely. By commenting that you do a review you kind of block others from
applying the change.</p>
+ <p class="alert alert-primary" role="alert">
NB: Jenkins performs a build for each pull request. You can
trigger a new build on a pull request using "retest this please" in a PR
comment.
-
- <div class="content--panel--separator"></div>
+ </p>
+ </div>
+ </div>
- <h3 ir="apply-pull-request">Apply pull requests</h3>
-
- This can obviously only be done by a committer. Do the
following steps.
+ <div class="row mb-5 mt-5">
+ <div class="col">
+ <h4 class="pb-3 mb-4">Apply pull requests</h4>
+ <p>This can obviously only be done by a committer. Do the
following steps.</p>
<ul class="community">
-
<li>As one time config, you can rename your git remote and
add apache one :<br/>
- <code>git remote add apache
https://git-wip-us.apache.org/repos/asf/karaf.git</code><br/><br/>
+ <code>> git remote add apache
https://gitbox.apache.org/repos/asf/karaf.git</code><br/><br/>
We recommand renaming <code>origin</code> as
<code>github</code> :<br/>
- <code>git remote rename origin github</code><br/><br/>
+ <code>> git remote rename origin
github</code><br/><br/>
For <code>github</code> remote, add an additional
fetch reference, which will cause every pull request to be made available as a
remote branch in your workspace :<br/>
- <code>git config --local --add remote.github.fetch
'+refs/pull/*/head:refs/remotes/github/pr/*'</code><br/><br/>
+ <code>> git config --local --add remote.github.fetch
'+refs/pull/*/head:refs/remotes/github/pr/*'</code><br/><br/>
You can confirm your configuration with the following
command :<br>
- <code>git remote -v</code><br>
- <code>apache
https://git-wip-us.apache.org/repos/asf/karaf.git (fetch)</code><br>
- <code>apache
https://git-wip-us.apache.org/repos/asf/karaf.git (push)</code><br>
- <code>github https://github.com/apache/karaf.git
(fetch)</code><br>
- <code>github https://github.com/apache/karaf.git
(push)</code><br>
- <code>username [email protected]:username/karaf.git
(fetch)</code><br>
- <code>username [email protected]:username/karaf.git
(push)</code>
+ <code>> git remote -v</code><br>
+ <code>apache
https://gitbox.apache.org/repos/asf/karaf.git (fetch)</code><br>
+ <code>apache
https://gitbox.apache.org/repos/asf/karaf.git (push)</code><br>
+ <code>github https://github.com/apache/karaf.git
(fetch)</code><br>
+ <code>github https://github.com/apache/karaf.git
(push)</code><br>
+ <code>username [email protected]:username/karaf.git
(fetch)</code><br>
+ <code>username [email protected]:username/karaf.git
(push)</code>
</li>
<li>Checkout the PR :<br/>
- <code>
- git fetch --all
- git checkout -b pr-xxx github/pr/xxx
- </code>
- </li>
+ <code>> git fetch --all</code><br>
+ <code>> git checkout -b pr-xxx github/pr/xxx</code>
+ </li>
<li>Review the PR, amend, squash the commits, requesting
changes, ... When done, add <code>LGTM</code> comment to approve the PR (or
click on the "Approve" button on GitHub) :<br/>
- <code>git rebase -i apache/master</code>
- </li>
+ <code>> git rebase -i apache/master</code>
+ </li>
<li>Merge the PR (it automatically closes the PR) :<br/>
- <code>git fetch --all</code><br>
- <code>git checkout apache/master</code><br>
- <code>git merge --no-ff -m "[KARAF-nnnn] This closes
#xxx" pr-xxx</code><br>
- <code>git push apache HEAD:master</code><br>
+ <code>> git fetch --all</code><br>
+ <code>> git checkout apache/master</code><br>
+ <code>> git merge --no-ff -m "[KARAF-nnnn] This closes
#xxx" pr-xxx</code><br>
Review comment:
That's not the preferred way: we now can use the merge button on github (for
committer).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Upgrade website style to bootstrap 4
> ------------------------------------
>
> Key: KARAF-5712
> URL: https://issues.apache.org/jira/browse/KARAF-5712
> Project: Karaf
> Issue Type: Improvement
> Components: website
> Reporter: Francois Papon
> Assignee: Francois Papon
> Priority: Minor
>
> It would be great to upgrade the website style with Bootstrap 4 for
> responsive design compatibility and to be more easy to upgrade content and
> style.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
