Commit graph

14 commits

Author SHA1 Message Date
GitLab Bot
0594381ba7 Add latest changes from gitlab-org/gitlab@master 2021-10-26 12:12:11 +00:00
GitLab Bot
de8e5077c3 Add latest changes from gitlab-org/gitlab@master 2021-06-07 12:10:00 +00:00
GitLab Bot
a83a97f604 Add latest changes from gitlab-org/gitlab@master 2020-05-28 12:08:10 +00:00
GitLab Bot
34e72e5412 Add latest changes from gitlab-org/gitlab@master 2020-05-21 18:08:27 +00:00
GitLab Bot
ad0265eead Add latest changes from gitlab-org/gitlab@master 2020-04-09 09:10:17 +00:00
Takuya Noguchi
55826e7783 Remove .card-title from .card-header for BS4 migration
Replaces .card-header > hX.card-title with hX.card-header to remove
.card-title. At a occurrence where bold styling is not necessary,
div.card-header is used instead.
By full removal of .card-title at the moment, all workarounds for
BS4's card-title are removed as well.

More information: https://getbootstrap.com/docs/4.0/migration/#panels

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-10-19 22:50:34 +09:00
Tim Zallmann
840ce49d4b Fixes the Terms Page 2018-06-04 17:02:49 +02:00
Clement Ho
62210cf5f5 fix terms spec 2018-05-17 16:50:13 -04:00
Clement Ho
15cdc8bfc8 Merge branch 'master' into 'bootstrap4'
# Conflicts:
#   app/views/groups/group_members/index.html.haml
2018-05-11 13:51:58 +00:00
tauriedavis
5b2e53eee7 46210 Display logo and user dropdown on mobile for terms page and fix styling 2018-05-09 13:42:50 -07:00
Annabel Dunstone Gray
336b50d030
Fix right-aligned menus; only display tooltip on hover 2018-05-08 09:16:35 -07:00
Bob Van Landuyt
7684217d68 Enforces terms in the web application
This enforces the terms in the web application. These cases are
specced:

- Logging in: When terms are enforced, and a user logs in that has not
  accepted the terms, they are presented with the screen. They get
  directed to their customized root path afterwards.
- Signing up: After signing up, the first screen the user is presented
  with the screen to accept the terms. After they accept they are
  directed to the dashboard.
- While a session is active:
  - For a GET: The user will be directed to the terms page first,
    after they accept the terms, they will be directed to the page
    they were going to
  - For any other request: They are directed to the terms, after they
    accept the terms, they are directed back to the page they came
    from to retry the request. Any information entered would be
    persisted in localstorage and available on the page.
2018-05-04 13:54:43 +02:00
Bob Van Landuyt
10aa55a770 Allow a user to accept/decline terms
When a user accepts, we store this in the agreements to keep track of
which terms they accepted. We also update the flag on the user.
2018-05-04 13:54:43 +02:00
Bob Van Landuyt
3629dc338f Display terms to a user
When terms are present, they can be viewed on `/-/users/terms`.
2018-05-04 13:52:55 +02:00