Skip to content

Commit

Permalink
Fix bug 1376454: Un-submodule pontoon.intro (#1064)
Browse files Browse the repository at this point in the history
And also:
* Update Pontoon Intro copy to become in-context demo page.
* Rename `intro` app to `in-context` and move URL config into it.
* Remove submodule instructions from developer & deployment docs,
  and travis config.
  • Loading branch information
mathjazz committed Aug 23, 2018
1 parent 2a137bb commit 6a1ec62
Show file tree
Hide file tree
Showing 29 changed files with 6,803 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -10,8 +10,6 @@ cache:
- $HOME/virtualenv/python2.7.14/bin
- $HOME/virtualenv/python2.7.14/lib
- $HOME/virtualenv/python2.7/bin
before_install:
- git submodule update --init --recursive

# make a copy of the python libs before running tests. These are then used to restore
# specifically the "py" and "pytest" packages (including any pyc etc) at the end of the
Expand Down
11 changes: 4 additions & 7 deletions docs/admin/deployment.rst
Expand Up @@ -17,13 +17,12 @@ Buildpack
---------
Pontoon uses several buildpacks in a specific order. They are (in order):

1. `heroku-buildpack-submodules`_ to fetch all related git submodules.
2. `heroku-buildpack-apt`_ for installing Subversion.
3. `heroku-buildpack-ssh`_ for setting up the SSH keys necessary for committing
1. `heroku-buildpack-apt`_ for installing Subversion.
2. `heroku-buildpack-ssh`_ for setting up the SSH keys necessary for committing
to version control.
4. The official ``heroku/nodejs`` buildpack for installing Node.js programs for
3. The official ``heroku/nodejs`` buildpack for installing Node.js programs for
pre-processing frontend assets.
5. The official ``heroku/python`` buildpack as our primary buildpack.
4. The official ``heroku/python`` buildpack as our primary buildpack.

You can set these buildpacks on your app with the following toolbelt commands:

Expand All @@ -34,9 +33,7 @@ You can set these buildpacks on your app with the following toolbelt commands:
heroku buildpacks:add --index 1 heroku/nodejs
heroku buildpacks:add --index 1 https://github.com/Osmose/heroku-buildpack-ssh.git#v0.1
heroku buildpacks:add --index 1 https://github.com/mozilla/heroku-buildpack-apt.git#v0.1
heroku buildpacks:add --index 1 https://github.com/dmathieu/heroku-buildpack-submodules#b37ffe4361bb9c975dd8e93068c9d296365d748c
.. _heroku-buildpack-submodules: https://github.com/dmathieu/heroku-buildpack-submodules
.. _heroku-buildpack-apt: https://github.com/mozilla/heroku-buildpack-apt
.. _heroku-buildpack-ssh: https://github.com/Osmose/heroku-buildpack-ssh

Expand Down
6 changes: 3 additions & 3 deletions docs/dev/setup-virtualenv.rst
Expand Up @@ -48,7 +48,7 @@ Installation

.. code-block:: bash
git clone --recursive https://github.com/mozilla/pontoon.git
git clone https://github.com/mozilla/pontoon.git
cd pontoon
2. Create a virtualenv for Pontoon and activate it:
Expand Down Expand Up @@ -112,8 +112,8 @@ Installation
local development site. Some people prefer to use
``http://127.0.0.1:8000`` instead of ``localhost``. However, should you
decide to change the ``SITE_URL``, you also need to request_
the new ``FXA_CLIENT_ID`` and ``FXA_SECRET_KEY``, and our demo/intro site
``http://localhost:8000/intro`` will require change of base url.
the new ``FXA_CLIENT_ID`` and ``FXA_SECRET_KEY``, and our in-context demo
site ``http://localhost:8000/in-context/`` will require change of base url.

6. Initialize your database by running the migrations:

Expand Down
5 changes: 2 additions & 3 deletions docs/dev/setup.rst
Expand Up @@ -24,10 +24,9 @@ Prerequisites
Quickstart
----------

1. Clone your `fork <http://help.github.com/fork-a-repo/>` of Pontoon repository
recursively::
1. Clone your `fork <http://help.github.com/fork-a-repo/>` of Pontoon repository::

$ git clone --recursive https://github.com/YOUR-USERNAME/pontoon.git
$ git clone https://github.com/YOUR-USERNAME/pontoon.git


2. From the root of the repository, run::
Expand Down
1 change: 1 addition & 0 deletions pontoon/in_context/README.md
@@ -0,0 +1 @@
This is a simple in-context localization demo page of [Pontoon](https://github.com/mozilla/pontoon).
Empty file added pontoon/in_context/__init__.py
Empty file.

0 comments on commit 6a1ec62

Please sign in to comment.