Commit 1b543499 authored by Aaron Wolf's avatar Aaron Wolf

updated git.snowdrift.coop links to gitlab.com

parent c726be09
[submodule "publications"]
path = publications
url = git@git.snowdrift.coop:sd/publications.git
url = git@gitlab.com:snowdrift/publications.git
......@@ -114,13 +114,11 @@ alternative working.
## Get the Snowdrift code
Our primary repository is at [git.snowdrift.coop/sd/snowdrift], and our
instructions assume that repository. For convenience and redundancy, we also
mirror at [GitHub].
Our primary repository is at [GitLab], and our instructions assume that repository. For convenience and redundancy, we also mirror at [GitHub].
From within your preferred directory, get the code with:
git clone https://git.snowdrift.coop/sd/snowdrift.git
git clone https://gitlab.com/snowdrift/snowdrift.git
Change to the new snowdrift directory:
......@@ -236,9 +234,9 @@ about technical development.
[brew]: http://brew.sh/
[Contributing Guide]: CONTRIBUTING.md
[Debian Stack install]: https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md#debian
[discussion about FreeBSD]: https://git.snowdrift.coop/sd/snowdrift/issues/67
[discussion about FreeBSD]: https://gitlab.com/snowdrift/snowdrift/issues/67
[Git]: http://www.git-scm.com/downloads
[git.snowdrift.coop/sd/snowdrift]: https://git.snowdrift.coop/sd/snowdrift
[GitLab]: https://gitlab.com/snowdrift/snowdrift
[GitHub]: https://github.com/snowdriftcoop/snowdrift
[instructions on the PostgreSQL wiki]: https://wiki.postgresql.org/wiki/YUM_Installation
[Make]: https://www.gnu.org/software/make/manual/html_node/index.html
......
......@@ -55,31 +55,28 @@ Recommended workflow:
The following covers the bare minimum process for those new to Git.
We collaborate via the FLO (Free/Libre/Open) site [git.snowdrift.coop] (running
GitLab CE). We also mirror on the popular but proprietary site [GitHub], but we
encourage everyone to use FLO tools, and so the instructions below assume
git.snowdrift.coop.
We collaborate on code using [GitLab]. We also mirror on the popular but proprietary site [GitHub] but do not use that regulary.
1. Locally clone the project from the main Snowdrift repo to your computer as
described in the BUILD guide
2. Fork the project at git.snowdrift.coop
* sign in or create an account on [git.snowdrift.coop](https://git.snowdrift.coop/users/sign_in)
2. Fork the project at GitLab.com
* sign in or create an account on [GitLab.com](https://gitlab.com/users/sign_in)
* go to the [project repository]
* click the "Fork" link (toward the top of the page)
* choose your account for the fork
* you should end up at your fork (to check, see that the header at the top
of the page has your account name followed by "/Snowdrift")
3. Add your git.snowdrift.coop fork as a remote for your local clone
3. Add your GitLab fork as a remote for your local clone
* While we recommend SSH, those not comfortable with the full [SSH setup]
can use HTTPS instead.
* For HTTPS, choose that instead of SSH from the dropdown menu on the page
of your fork at git.snowdrift.coop
of your fork at GitLab
* copy the address (which looks like
`https://git.snowdrift.coop/YOURNAME/snowdrift.git` where `YOURNAME` is
your git.snowdrift.coop username).
`https://gitlab.com/YOURNAME/snowdrift.git` where `YOURNAME` is
your GitLab username).
* using the correct address, enter a modified version of this command in the
directory of your local clone:
`git remote add my-snow https://git.snowdrift.coop/YOURNAME/snowdrift.git`
`git remote add my-snow https://gitlab.com/YOURNAME/snowdrift.git`
#### Updating your local code to snowdrift master
......@@ -149,13 +146,13 @@ same overall update), you have confirmed that everything works as intended, and
all tests pass, run `git status` to make sure no work is missing and all new
files were committed.
Next, send your changes to your git.snowdrift.coop account with:
Next, send your changes to your GitLab account with:
git push -u my-snow some-branch
Changing `some-branch` to the name of the branch where you made the commit(s).
To notify the snowdrift team about your work, visit the git.snowdrift.coop page
To notify the snowdrift team about your work, visit the GitLab page
with your fork. You should see a button called **"Create Merge Request"**. Click
that to bring up a form where you can add further notes about your work
(especially useful if you are merging multiple commits). You may ignore "Assign
......@@ -239,7 +236,7 @@ As a best practice, we want adequate code review for every merge before it goes
into the master code.
To help with code review, please choose to *watch* the code repository at
[git.snowdrift.coop] (and perhaps also the [GitHub] mirror if you use GitHub).
[] (and perhaps also the [GitHub] mirror if you use GitHub).
Then, you can make general and in-line comments about new code as it is
committed and before it goes into the master repository.
......@@ -318,18 +315,18 @@ here are some resources (nearly all fully-FLO):
[Build guide]: BUILD.md
[contact options]: https://snowdrift.coop/contact
[design]: https://git.snowdrift.coop/sd/design
[git.snowdrift.coop]: https://git.snowdrift.coop/sd/snowdrift
[design]: https://gitlab.com/snowdrift/design
[GitLab]: https://gitlab.com/snowdrift/snowdrift
[GHCJS]: https://github.com/ghcjs/ghcjs
[GitHub]: https://github.com/snowdriftcoop/snowdrift
[issues]: https://git.snowdrift.coop/sd/snowdrift/issues?label_name%5B%5D=newcomer-friendly
[issues]: https://gitlab.com/snowdrift/snowdrift/issues?label_name%5B%5D=newcomer-friendly
[LibreJS plugin]: https://www.gnu.org/software/librejs/
[project repository]: https://git.snowdrift.coop/sd/snowdrift
[project repository]: https://gitlab.com/snowdrift/snowdrift
[PureScript]: http://www.purescript.org/
[README]: README.md
[Sass]: https://sass-lang.com
[Shakespearean Templates]: https://www.yesodweb.com/book/shakespearean-templates
[SSH setup]: https://git.snowdrift.coop/help/ssh/README
[SSH setup]: https://gitlab.com/help/ssh/README
[TEXTEDITORS.md]: TEXTEDITORS.md
[Unobtrusive JavaScript]: https://en.wikipedia.org/wiki/Unobtrusive_JavaScript
[wiki]: https://wiki.snowdrift.coop/
......
# [Snowdrift.coop]
[![build status](https://git.snowdrift.coop/sd/snowdrift/badges/master/build.svg)](https://git.snowdrift.coop/sd/snowdrift/commits/master)
[![build status](https://gitlab.com/snowdrift/snowdrift/badges/master/build.svg)](https://gitlab.com/snowdrift/snowdrift/commits/master)
This is the software that runs the [Snowdrift.coop] website.
It uses the [Yesod web framework] and [Haskell] programming language.
......@@ -14,11 +14,9 @@ Key links:
## Code repositories
Main repositories: [git.snowdrift.coop] (running GitLab CE)
Main repositories: [gitlab.com/snowdrift]
We also mirror the code repo on [GitHub] but prefer issues and merge requests at
the main location (and we do not maintain mirrors of the separate project repos
like design, legal, ops, etc.).
We also mirror the code repo on [GitHub] but prefer issues and merge requests at the main location (and we do not maintain mirrors of the separate project repos like design, legal, ops, etc.).
## Contributing
......@@ -33,8 +31,7 @@ core points are:
* Follow our [build instructions] to build and test the software.
* File and search concrete issues/tickets/tasks in the [issues] sections at
git.snowdrift.coop.
* File and search concrete issues/tickets/tasks in our GitLab [issues]
* Get in touch *any* time. Don't hesitate to ask questions, ask for help,
provide feedback etc. Use any of our [contact options] as appropriate.
......@@ -56,12 +53,12 @@ Our text and graphics documents (non-program-code) are also licensed under
[contributor guide]: CONTRIBUTING.md
[GitHub]: https://github.com/snowdriftcoop/snowdrift
[Haskell]: https://www.haskell.org/
[code issues]: https://git.snowdrift.coop/sd/snowdrift/issues
[code issues]: https://gitlab.com/snowdrift/snowdrift/issues
[roadmap]: https://wiki.snowdrift.coop/planning
[Snowdrift.coop]: https://snowdrift.coop/
[What is Snowdrift?]: https://snowdrift.coop/about
[Yesod web framework]: http://www.yesodweb.com/
[git.snowdrift.coop]: https://git.snowdrift.coop/sd
[gitlab.com/snowdrift]: https://gitlab.com/snowdrift/
[how-to-help]: https://wiki.snowdrift.coop/community/how-to-help
[Specs]: SPECS-STORIES.md
[Code of Conduct]: https://wiki.snowdrift.coop/community/conduct
......
This package exists for sanity and sanitation. See
https://git.snowdrift.coop/sd/snowdrift for the main codebase.
https://gitlab.com/snowdrift/snowdrift for the main codebase.
......@@ -26,7 +26,7 @@ main () {
if [ ! -d snowdrift ]
then
log "Cloning repo"
git clone https://git.snowdrift.coop/sd/snowdrift.git
git clone https://gitlab.com/snowdrift/snowdrift.git
cd snowdrift
else
cd snowdrift
......
......@@ -7,9 +7,9 @@ packages:
- crowdmatch
- run-persist
# This is patched to use UTCTime instead of Localtime (needs to get moved
# upstream: see https://git.snowdrift.coop/sd/snowdrift/issues/8)
# upstream: see https://gitlab.com/snowdrift/snowdrift/issues/8)
- location:
git: https://git.snowdrift.coop/sd/postgresql-simple-migration-patches.git
git: https://gitlab.com/snowdrift/postgresql-simple-migration-patches.git
commit: 55ae21a7ee5b0386ec7c6909409b1bdacebcc924
extra-dep: true
- location:
......
......@@ -10,11 +10,11 @@ synopsis: Infrastructure for the Snowdrift.coop fundraising site.
category: Web
stability: Experimental
homepage: https://snowdrift.coop
bug-reports: https://git.snowdrift.coop/sd/snowdrift/issues
bug-reports: https://gitlab.com/snowdrift/snowdrift/issues
source-repository head
type: git
location: https://git.snowdrift.coop/sd/snowdrift.git
location: https://gitlab.com/snowdrift/snowdrift.git
Flag dev
Description: Turn on development settings, like auto-reload templates.
......
......@@ -47,11 +47,11 @@ $# mark.
\ categories to read, comment or post about anything related to
Snowdrift.coop.
<li .item>
<a href="https://git.snowdrift.coop/sd">
<a href="https://gitlab.com/snowdrift/">
<img .img .git src=@{StaticR img_about_git_png}>
<p .desc>
Squash bugs or have a look at how things are evolving in
<a .link href="https://git.snowdrift.coop/sd">
<a .link href="https://gitlab.com/snowdrift/">
our git repository
.
<li .item>
......
......@@ -40,8 +40,8 @@ $nothing
<li>
<a href="https://blog.snowdrift.coop">Blog
<li>
<a href="https://git.snowdrift.coop/groups/sd/-/activity">
Code and other activity at git.snowdrift.coop
<a href="https://gitlab.com/groups/snowdrift/-/activity">
Code and other activity at gitlab.com/snowdrift
<li>
Follow us on Mastodon
<a href="https://social.coop/@snowdrift">
......@@ -55,8 +55,8 @@ $nothing
planning section of our wiki
<li>
Specific tasks we're working on are tracked at
<a href="https://git.snowdrift.coop/groups/sd/-/issues">
git.snowdrift.coop issues
<a href="https://gitlab.com/groups/snowdrift/-/issues">
GitLab issues
<.transparency>
<h2>Financial transparency report
<p>
......
<!--
This terms.hamlet file was generated from a markdown source file at https://git.snowdrift.coop/sd/legal/blob/master/terms-of-service.md using the following steps:
This terms.hamlet file was generated from a markdown source file at https://gitlab.com/snowdrift/legal/blob/master/terms-of-service.md using the following steps:
1. Convert to HTML with `pandoc terms-of-service.md` (don't use too old version of pandoc)
2. Convert to hamlet with `html2hamlet terms-of-service.html terms.hamlet`
......@@ -21,7 +21,7 @@
<em>
Version 0.4
(see our
<a href="https://git.snowdrift.coop/sd/legal/blob/master/CHANGELOG.md">
<a href="https://gitlab.com/snowdrift/legal/blob/master/CHANGELOG.md">
changelog
for history)
<h2 #introduction>
......@@ -166,7 +166,7 @@
We use certain terms with specific meanings throughout the agreement.
<ol style="list-style-type: decimal">
<li>
The “Agreement” refers, collectively, to all the terms, conditions, notices contained or referenced in this document (the “Terms of Service” or the "Terms") and all other operating rules, policies (including the <a href=@{PrivacyR}>Snowdrift.coop Privacy Policy</a>), and procedures that we may publish from time to time on the Website. Most of our site policies are available at our <a .uri href="https://git.snowdrift.coop/sd/legal/">legal repository</a>.
The “Agreement” refers, collectively, to all the terms, conditions, notices contained or referenced in this document (the “Terms of Service” or the "Terms") and all other operating rules, policies (including the <a href=@{PrivacyR}>Snowdrift.coop Privacy Policy</a>), and procedures that we may publish from time to time on the Website. Most of our site policies are available at our <a .uri href="https://gitlab.com/snowdrift/legal/">legal repository</a>.
<li>
The “Service” refers to any services, software, products, and applications provided by Snowdrift.coop.
<li>
......@@ -342,7 +342,7 @@
Most public writings and images at Snowdrift.coop are free to use and share under CC BY-SA (with attribution credit simply to "Snowdrift.coop"), with the following exceptions and qualifications:
<ul>
<li>
The Snowdrift.coop website source code is licensed under the terms of the <a href="https://git.snowdrift.coop/sd/snowdrift/blob/master/LICENSE.md">GNU AGPLv3+</a>.
The Snowdrift.coop website source code is licensed under the terms of the <a href="https://gitlab.com/snowdrift/snowdrift/blob/master/LICENSE.md">GNU AGPLv3+</a>.
<li>
All Snowdrift.coop trademarks belong to Snowdrift.coop, and any use of our trade names, trademarks, service marks, logos, or domain names must be in compliance with both these Terms and with our <a href=@{TrademarksR}>Trademark Policy</a>.
<li>
......@@ -413,10 +413,10 @@
If you believe that Content anywhere on Snowdrift.coop infringes on a copyright you hold, we encourage you to first reach out informally via one of the methods on our <a href=@{ContactR}>contact page</a>.
<p>
To take action under Section 512(c) of the U.S. Digital Millennium Copyright Act of 1998, follow our
<a href="https://git.snowdrift.coop/sd/legal/blob/master/DMCA/DMCA-guide.md">
<a href="https://gitlab.com/snowdrift/legal/blob/master/DMCA/DMCA-guide.md">
DMCA Guide
and the connected
<a href="https://git.snowdrift.coop/sd/legal/blob/master/DMCA/DMCA-takedowns.md">
<a href="https://gitlab.com/snowdrift/legal/blob/master/DMCA/DMCA-takedowns.md">
DMCA Takedown Notice Guide
Pursuant to the DMCA, we will terminate, in appropriate circumstances, the Accounts of repeat infringers.
<div .figure>
......@@ -476,7 +476,7 @@
1. Project Requirements
<p>
To register a Project for listing at Snowdrift.coop, you must meet all of our
<a href="https://git.snowdrift.coop/sd/legal/blob/master/project-reqs.md">
<a href="https://gitlab.com/snowdrift/legal/blob/master/project-reqs.md">
Project Requirements
<h4 #receiving-donations>
2. Receiving donations
......@@ -566,7 +566,7 @@
<h4 #legal-notice-to-snowdrift-coop-must-be-in-writing>
2. Legal Notice to Snowdrift.coop Must Be in Writing
<p>
In any situation where notice is required by contract or any law or regulation, communications made through email or our community forum will not constitute legal notice to Snowdrift.coop or any of its officers, employees, agents, or representatives. Legal notices must be in writing and <a href="https://git.snowdrift.coop/sd/legal/blob/master/legal-requests.md">served on Snowdrift.coop's legal agent</a>.
In any situation where notice is required by contract or any law or regulation, communications made through email or our community forum will not constitute legal notice to Snowdrift.coop or any of its officers, employees, agents, or representatives. Legal notices must be in writing and <a href="https://gitlab.com/snowdrift/legal/blob/master/legal-requests.md">served on Snowdrift.coop's legal agent</a>.
<h3 #l-disclaimer-of-warranties>
L. Disclaimer of Warranties
<p>
......@@ -629,7 +629,7 @@
<em>
We want our users to be informed of important changes to our terms, but we don't want to bother you every time we fix a typo. While we may modify this agreement at any time, we will notify users of any changes that affect your rights. When feasible, we will also offer a comment period before updates are set.
<p>
We reserve the right, at our sole discretion, to amend these Terms of Service at any time and will update these Terms of Service in the event of any such amendments. We will notify our Users of material changes to this Agreement at least 30 days prior to the change taking effect by posting a notice on our Website. For non-material modifications, your continued use of the Website constitutes agreement to our revisions of these Terms of Service. You can view all changes to these Terms in the history view of our <a href="https://git.snowdrift.coop/sd/legal/">git repository</a>.
We reserve the right, at our sole discretion, to amend these Terms of Service at any time and will update these Terms of Service in the event of any such amendments. We will notify our Users of material changes to this Agreement at least 30 days prior to the change taking effect by posting a notice on our Website. For non-material modifications, your continued use of the Website constitutes agreement to our revisions of these Terms of Service. You can view all changes to these Terms in the history view of our <a href="https://gitlab.com/snowdrift/legal/">git repository</a>.
<p>
We reserve the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Website (or any part of it) with or without notice.
<h3 #p-miscellaneous>
......
......@@ -15,7 +15,7 @@
The primary name "Snowdrift" when used in the context of online
fundraising, creative project support, and/or community building
<li>Our various identifying #
<a href="https://git.snowdrift.coop/sd/design/wikis/design-guide/readme#the-logo">logos
<a href="https://gitlab.com/snowdrift/design/wikis/design-guide/readme#the-logo">logos
<li>
The term "crowdmatching" when used in the context of fundraising
<p>
......@@ -126,7 +126,7 @@
Note that we do
<em>not
hold trademarks on the
<a href="https://git.snowdrift.coop/sd/design/wikis/design-guide/readme#mimi-eunice">
<a href="https://gitlab.com/snowdrift/design/wikis/design-guide/readme#mimi-eunice">
Mimi &amp; Eunice
characters.
They are our
......
......@@ -17,7 +17,7 @@ data StripeMockEffects
, stripeRet :: Either StripeError (StripeReturn a)
}
{-# WARNING mockStripe "This does not work. See comments on https://git.snowdrift.coop/sd/snowdrift/merge_requests/21" #-}
{-# WARNING mockStripe "This does not work. See comments on https://gitlab.com/snowdrift/snowdrift/merge_requests/21" #-}
-- | Ideally this could be used to mock Stripe effects, but it does not work
-- yet.
mockStripe
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment