summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Unified repository/show.html for CE and EE6104-ee-ce-differenceDenys Mishunov2019-05-292-2/+7
| | | | | | | Corresponding partials containing differences have been added to corresponding folder. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6104
* Make external_dashboard_url available to frontendReuben Pereira2019-05-291-1/+1
| | | | | - On Operations settings page - On Metrics dashboard page
* Merge branch 'vue-repo-breadcrumbs' into 'master'Filipa Lacerda2019-05-294-65/+67
|\ | | | | | | | | Added repository file listing breadcrumbs See merge request gitlab-org/gitlab-ce!28706
| * Created repository list breadcrumbs Vue appPhil Hughes2019-05-294-65/+67
| |
* | Merge branch 'tpresa-using-license-seat' into 'master'Sean McGivern2019-05-291-0/+2
|\ \ | | | | | | | | | | | | Show if a user is using a license seat See merge request gitlab-org/gitlab-ce!28790
| * | Show if a user is using a license seattpresa-using-license-seatThiago Presa2019-05-281-0/+2
| | |
* | | Merge branch 'i18n-status-fix' into 'master'Bob Van Landuyt2019-05-291-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Remove leading whitespace on translatable string: "Status" See merge request gitlab-org/gitlab-ce!23856
| * | Merged changes from masterDavid Planella2019-05-28576-2999/+3944
| |\ \
| * | | Fix leading whitespace in translatable stringDavid Planella2018-12-161-1/+1
| | | |
* | | | Merge branch 'repo-router-fixes' into 'master'Filipa Lacerda2019-05-292-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes repository Vue router hiding elements on root URL See merge request gitlab-org/gitlab-ce!28821
| * | | | Fixes repository Vue router hiding elements on root URLPhil Hughes2019-05-282-2/+2
| | | | |
* | | | | Merge branch 'sh-add-header-to-jobs-admin-page' into 'master'Clement Ho2019-05-281-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add a column header to admin/jobs page Closes #62347 See merge request gitlab-org/gitlab-ce!28837
| * | | | Add a column header to admin/jobs pagesh-add-header-to-jobs-admin-pageStan Hu2019-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column was blank before. It contain one or two pieces of information: * Job duration * Job completion timestamp For brevity, use `Timing` as the header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62347
* | | | | Externalize strings of chat page in user profileantony liu2019-05-282-10/+10
|/ / / /
* | | | Externalize strings of notifications page in user profileantony liu2019-05-284-11/+11
|/ / /
* | | Merge branch 'vue-repo-document-title' into 'master'Filipa Lacerda2019-05-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update document title when repository router changes See merge request gitlab-org/gitlab-ce!28714
| * | | Update document title when repository router changesPhil Hughes2019-05-241-1/+1
| | | |
* | | | Fix display of promote to group labelJan Provaznik2019-05-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since label presenter is used in label index view, label class check doesn't work as expected because the class is now LabelPresenter. Also `label.subject` doesn't work as expected now because Label's model `subject` method is shadowed by Gitlab's presenter's method which uses `subject` for referencing the original object. Instead we use a presenter's method for both checks now. `label_deletion_confirm_text` is not used anywhere so it's removed
* | | | Merge branch 'project-members-scb' into 'master'Phil Hughes2019-05-281-18/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in project members Closes gitlab-ee#10496 See merge request gitlab-org/gitlab-ce!28550
| * | | | Resolve CE/EE diffs in project membersproject-members-scbLuke Bennett2019-05-271-18/+24
| | |_|/ | |/| | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'i18n-preferences-of-user-profile' into 'master'Bob Van Landuyt2019-05-281-13/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Externalize strings of preferences page in user profile See merge request gitlab-org/gitlab-ce!28746
| * | | | Externalize strings of preferences page in user profileantonyliu2019-05-251-13/+13
| | |/ / | |/| |
* | | | Externalize stirngs of Authentication log page in user profileantony liu2019-05-282-6/+4
| | | |
* | | | Update ↵Benedikt Franke2019-05-271-1/+1
| |/ / |/| | | | | | | | changelogs/unreleased/28757-remove-docker-pull-prefix-when-copying-a-tag-from-the-registry.yml
* | | Add no-tabs class and externalize stringsMartin Wortschack2019-05-271-9/+9
| | | | | | | | | | | | | | | | | | | | | - Add .no-tabs to login-box - Externalize strings in common signup box - Leverage render_if_exists - Update PO file
* | | Merge branch '57189-css-label-in-forms-with-bootstrap4' into 'master'Filipa Lacerda2019-05-2717-83/+123
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix bug candidates of forms on Bootstrap Grid system Closes #57189 See merge request gitlab-org/gitlab-ce!24885
| * | | Fix col-sm-* in forms to keep layoutTakuya Noguchi2019-05-2717-83/+123
| |/ / | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | Add changelog entryJacques Erasmus2019-05-272-1/+14
| | | | | | | | | | | | Added a changelog entry for the feature
* | | Add expand/collapse buttonAdriel Santiago2019-05-272-2/+4
| | | | | | | | | | | | Add ability to expand/collapse error tracking settings
* | | Add support for toggling masked on UIexplicit_masked_qaThong Kuah2019-05-271-1/+1
|/ / | | | | | | | | | | In addition to API, add support for toggling mased on UI too. (Though fabricate_via_browser_ui is private)
* | Merge branch ↵Filipa Lacerda2019-05-241-5/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile' into 'master' Resolve "Move sign-in/2FA on users/sign_in above intro content on mobile" Closes #59987 See merge request gitlab-org/gitlab-ce!28360
| * | Prioritize login form on mobile breakpoint59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobileDennis Tang2019-05-161-5/+7
| | |
* | | Merge branch '61880-download-btn-group' into 'master'Phil Hughes2019-05-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Group download buttons in a .btn-group Closes #61880 See merge request gitlab-org/gitlab-ce!28599
| * | | Group download buttons in a .btn-group61880-download-btn-groupAnnabel Dunstone Gray2019-05-231-1/+1
| | | |
* | | | Update smiley icons to new onesJarek Ostrowski2019-05-237-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new emoji icons Remove added SVGs Change to sprite_icons Prettify Fix text left behind Fix errors Remove background top level reaction icon
* | | | Move EE differences for `app/views/projects/commits/_commit.html.haml`Natalia Tepluhina2019-05-231-0/+4
| | | |
* | | | Merge branch '61049-links-activity-stream' into 'master'Phil Hughes2019-05-231-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blue for activity stream links; use monospace font for commit sha Closes #61049 See merge request gitlab-org/gitlab-ce!28558
| * | | | Use blue for activity stream links; use monospace font for commit sha61049-links-activity-streamAnnabel Dunstone Gray2019-05-221-1/+2
| |/ / /
* | | | Added a content field to atom feedDevin Sylva2019-05-221-0/+1
| | | |
* | | | Give 'New Snippet' button green outlineMarcel van Remmerden2019-05-221-1/+1
|/ / /
* | | Merge branch 'import-form-scb' into 'master'Phil Hughes2019-05-221-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in import form Closes gitlab-ee#10492 See merge request gitlab-org/gitlab-ce!28575
| * | | Resolve CE/EE diffs in import formLuke Bennett2019-05-221-0/+3
| | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'label-row-scb' into 'master'Phil Hughes2019-05-221-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in label row Closes gitlab-ee#10493 See merge request gitlab-org/gitlab-ce!28551
| * | | | Resolve CE/EE diffs in label rowlabel-row-scbLuke Bennett2019-05-211-0/+1
| |/ / / | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'signin-box-scb' into 'master'Phil Hughes2019-05-221-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in signin box Closes gitlab-ee#10495 See merge request gitlab-org/gitlab-ce!28553
| * | | | Resolve CE/EE diffs in signin boxsignin-box-scbLuke Bennett2019-05-211-2/+6
| |/ / / | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'admin-users-form-scb' into 'master'Phil Hughes2019-05-221-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in admin users form Closes gitlab-ee#10508 See merge request gitlab-org/gitlab-ce!28520
| * | | | Resolve CE/EE diffs in admin users formadmin-users-form-scbLuke Bennett2019-05-211-0/+6
| | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | Merge branch '39304-broadcast-message-buttons' into 'master'Annabel Dunstone Gray2019-05-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update broadcast message icons Closes #39304 See merge request gitlab-org/gitlab-ce!28496
| * | | | | Update broadcast message icons39304-broadcast-message-buttonsJarek Ostrowski2019-05-211-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add icons from gitlab-svgs Remove btn-sm class for better sizing Add changelog Update mr number changelog Change to sprite_icon
View Lorry Controller Status