summaryrefslogtreecommitdiff
path: root/app/views/admin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bootstrap4Clement Ho2018-05-0810-64/+131
|\
| * Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-071-1/+1
| |\
| | * Share _form and show for project, instance and group runnersDylan Griffith2018-05-071-1/+1
| * | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-072-0/+27
| |\ \
| | * | Adds changelog entry, changes RemoteMirror#sync? to be semantically sound and...Tiago Botelho2018-05-071-1/+1
| | * | Adds remote mirror table migrationTiago Botelho2018-05-072-0/+27
| | |/
| * | Update link to the official git websiteToon Claes2018-05-071-1/+1
| |/
| * Merge branch 'fix-runner-pages-errors' into 'master'Kamil Trzciński2018-05-061-1/+1
| |\
| | * Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pagesDylan Griffith2018-05-041-1/+1
| * | Enforces terms in the web applicationBob Van Landuyt2018-05-041-52/+52
| * | Store application wide termsBob Van Landuyt2018-05-042-3/+14
| * | Add `Term` model to keep track of termsBob Van Landuyt2018-05-041-0/+22
| |/
| * Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-043-1/+9
| |\
| | * Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-036-9/+8
| | |\
| | * | Use group_type? where possible during transition periodDylan Griffith2018-05-012-3/+3
| | * | Rename Runner#group? -> #assigned_to_group? and Runner#project? -> #assigned_...Dylan Griffith2018-04-302-3/+3
| | * | Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-241-1/+1
| | |\ \
| | * | | different text on admin runner page for group r.Alexis Reigel2018-04-231-0/+3
| | * | | denote group runners on admin runners pageAlexis Reigel2018-04-232-1/+6
| * | | | Use limited_counter_with_delimiter in the admin user list tabsRobert Speicher2018-05-031-7/+7
| | |_|/ | |/| |
| * | | Merge branch '45761-replace-actionview-time_ago_in_words' into 'master'Rémy Coutable2018-05-024-5/+4
| |\ \ \
| | * | | Replace time_ago_in_words with JS-based oneTakuya Noguchi2018-04-274-5/+4
| | | |/ | | |/|
* | | | Merge branch 'master' into bootstrap4Clement Ho2018-04-262-4/+4
|\ \ \ \ | |/ / /
| * | | Resolve "User deletion modal with same info for delete user / delete user and...schwedenmut2018-04-262-4/+4
| |/ /
* | | Revert .hide to .d-none conversionClement Ho2018-04-241-2/+2
* | | Add table-header-group display classClement Ho2018-04-241-1/+1
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-241-1/+1
|\ \ \ | |/ /
| * | Update repository storages documentation URLAsh McKenzie2018-04-231-1/+1
| |/
* | Add .nav.nav-tabs to nav-linksClement Ho2018-04-194-4/+4
* | Fix failing spec because of light-well referenceClement Ho2018-04-191-1/+1
* | Fix dropdownsClement Ho2018-04-173-3/+3
* | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-163-1/+4
|\ \ | |/
| * Merge branch 'ash.mckenzie/include-sha-with-version' into 'master'Nick Thomas2018-04-161-0/+1
| |\
| | * Include git SHA with GitLab versionAsh McKenzie2018-04-121-0/+1
| * | Don't reset application settings oauth providers by mistakeDmitriy Zaporozhets2018-04-131-0/+1
| * | Don't reset application settings import sourcesDmitriy Zaporozhets2018-04-131-0/+1
* | | [skip ci] Convert wells to card, port info-wellClement Ho2018-04-132-5/+5
* | | [skip ci] Convert previous .card to .board-cardClement Ho2018-04-132-10/+10
* | | [skip ci] fix overzealous .badge-pill renames from scss migration scriptClement Ho2018-04-131-1/+1
* | | [skip ci] convert label-gray and label-inverse to badge-gray and badge-inverseClement Ho2018-04-132-3/+3
* | | [skip ci] label-info => badge-infoClement Ho2018-04-132-2/+2
* | | [skip ci] label-danger => badge-dangerClement Ho2018-04-133-3/+3
* | | [skip ci] Convert label-success to badge-successClement Ho2018-04-133-3/+3
* | | [skip ci] label-primary => badge-primaryClement Ho2018-04-131-1/+1
* | | [skip ci] label-warning => badge-warningClement Ho2018-04-133-3/+3
* | | [skip ci] Convert .label. to .badge.Clement Ho2018-04-136-16/+16
* | | [skip ci] col-*-push and col-*-pull => order-*Clement Ho2018-04-132-2/+2
* | | [skip ci] Replace col-*-offset-* with offset-*-*Clement Ho2018-04-1325-39/+39
* | | [skip ci] add col-sm-* for form-horizontal changes to keep layoutClement Ho2018-04-127-27/+27
* | | [skip ci] Convert btn-xs to btn-smClement Ho2018-04-128-19/+19
View Lorry Controller Status