#3898 Remove "Activate" from project options
Merged 5 years ago by pingou. Opened 5 years ago by jingjing.
jingjing/pagure activate  into  master

file modified
+10 -10
@@ -8,7 +8,7 @@ 

  This page presents the different settings and there effect.

  

  

- `Activate always merge`

+ `Always merge`

  ------------------------

  

  This Boolean enables or disables always making a merge commit when merging
@@ -26,11 +26,11 @@ 

    automatically due to one or more conflicts. Then pagure signals it and prevent

    merging.

  

- If the `Activate always merge` option is on, then the `fast-forward` option

+ If the `Always merge` option is on, then the `fast-forward` option

  above is disabled in favor of the `merge` option.

  

  

- `Activate comment editing`

+ `Comment editing`

  --------------------------

  

  This Boolean enables or disables editing comments.
@@ -46,7 +46,7 @@ 

  and this setting allows turning it on or off.

  

  

- `Activate Enforce signed-off commits in pull-request`

+ `Enforce signed-off commits in pull-request`

  -----------------------------------------------------

  

  This Boolean enables or disables checking for a 'Signed-off-by' line (case
@@ -59,7 +59,7 @@ 

            line to be pushed directly, it only work at the pull-request level.

  

  

- `Activate issue tracker`

+ `Issue tracker`

  ------------------------

  

  This Boolean simply enables or disables the issue tracker for the project.
@@ -67,7 +67,7 @@ 

  disable reporting issue on pagure by un-checking this option.

  

  

- `Activate Minimum score to merge pull-request`

+ `Minimum score to merge pull-request`

  ----------------------------------------------

  

  This option can be used for project wishing to enforce having a minimum
@@ -98,7 +98,7 @@ 

            score.

  

  

- `Activate Only assignee can merge pull-request`

+ `Only assignee can merge pull-request`

  -----------------------------------------------

  

  This option can be used for project wishing to institute a strong review
@@ -108,7 +108,7 @@ 

  can merge it.

  

  

- `Activate project documentation`

+ `Project documentation`

  --------------------------------

  

  Pagure offers the option to have a git repository specific for the
@@ -122,7 +122,7 @@ 

  this option.

  

  

- `Activate pull requests`

+ `Pull requests`

  ------------------------

  

  Pagure offers the option to fork a project, make changes to it and then ask
@@ -137,7 +137,7 @@ 

  .. note:: disabling pull-requests does *not* disable forking the projects.

  

  

- `Activate Web-hooks`

+ `Web-hooks`

  --------------------

  

  Pagure offers the option of sending notification about event happening on a

@@ -19,12 +19,12 @@ 

              <input id="{{ key }}" type="checkbox" value="y" name="{{ key }}" {%

                      if repo.settings[key] -%}checked=""{%- endif -%}/>

              <span class="c-indicator"></span>

-             Activate {{ key | replace('_', ' ') }}

+             {{ key | replace('_', ' ') | capitalize }}

            </label>

          </div>

        {% elif key in ['Web-hooks'] %}

          <div class="form-inline">

-           <label for="{{ key }}">Activate {{ key | replace('_', ' ') }} :</label>

+           <label for="{{ key }}">{{ key | replace('_', ' ') | capitalize }} :</label>

            <textarea width="4em" class="form-control" id="{{ key }}" type="text" {% if repo.settings[key]

              %}value="{{ repo.settings[key] }}"{% endif %} name="{{ key }}"

              title="Web-hook URLs, one per line"
@@ -32,7 +32,7 @@ 

          </div>

        {% else %}

          <div class="form-inline">

-           <label for="{{ key }}">Activate {{ key | replace('_', ' ') }} :</label>

+           <label for="{{ key }}">{{ key | replace('_', ' ') | capitalize }} :</label>

            <input width="4em" class="form-control" id="{{ key }}" type="text" {% if repo.settings[key]

                  %}value="{{ repo.settings[key] }}"{% endif %} name="{{ key }}" />

          </div>

Fixes #3828

Three parts are updated:
1. Update HTML template, remove 'Activate'
2. Update doc accordingly

@pingou Please kindly help to review:-)

I suspect this is going to break every existing projects, so :thumbsdown: to this change)

You can do {{ key | replace('_', ' ') | capitalize }} here directly (cf http://jinja.pocoo.org/docs/2.10/templates/#capitalize)

And the unit-tests are failing :)

rebased onto e7bba52e8797a891a280c8db11595f8d8e2c5854

5 years ago

rebased onto e7bba52e8797a891a280c8db11595f8d8e2c5854

5 years ago

rebased onto 10bbd37

5 years ago

rebased onto 10bbd37

5 years ago

@pingou
Thanks for your review, updated.

Looks like it needs a rebase, trying to apply it manually results in conflicts

Commit 6b2e3dd fixes this pull-request

Pull-Request has been merged by pingou

5 years ago