summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 'js-i18n-u' into 'master'Clement Ho2019-05-242-15/+26
|\ | | | | | | | | I18N JS files starting with u See merge request gitlab-org/gitlab-ce!28177
| * I18N JS files starting with ujs-i18n-uBrandon Labuschagne2019-05-232-15/+26
| | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | Merge branch '58632-fix-mr-widget-padding' into 'master'Mike Greiling2019-05-243-37/+45
|\ \ | | | | | | | | | | | | | | | | | | Fix MR widget padding Closes #58632 See merge request gitlab-org/gitlab-ce!28472
| * | Fix MR widget padding58632-fix-mr-widget-paddingHeinrich Lee Yu2019-05-203-37/+45
| | | | | | | | | | | | Align elements horizontally and add missing bottom padding
* | | Merge branch 'ce-jej/group-saml-cleans-up-identity' into 'master'Mayra Cabrera2019-05-241-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Adds Identity#for_user for use in an EE MR See merge request gitlab-org/gitlab-ce!28697
| * | | Adds Identity#for_user for use in an EE MRce-jej/group-saml-cleans-up-identityJames Edwards-Jones2019-05-241-0/+1
| | | |
* | | | Merge branch 'vue-repo-list-backend-frontend' into 'master'Filipa Lacerda2019-05-248-70/+194
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Pull files for repository tree from GraphQL API See merge request gitlab-org/gitlab-ce!28638
| * | | | Pull files for repository tree from GraphQL APIPhil Hughes2019-05-248-70/+194
| | | | |
* | | | | Merge branch '60778-input-text-height' into 'master'Filipa Lacerda2019-05-242-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix height of input groups Closes #61304, #61303, #59254, and #60778 See merge request gitlab-org/gitlab-ce!28495
| * | | | Fix height of input groups60778-input-text-heightAnnabel Dunstone Gray2019-05-202-0/+5
| | | | |
* | | | | Add support for second `config` paramkp-add-graphql-full-config-supportKushal Pandya2019-05-241-4/+4
| | | | |
* | | | | Prevent icons from shrinking in User popover when contents exceed containerKushal Pandya2019-05-241-3/+7
| | | | |
* | | | | Merge branch 'vrt-mr-update-ce-backport' into 'master'Phil Hughes2019-05-242-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conformance MR for Update Visual Review Toolbar to post to MRs See merge request gitlab-org/gitlab-ce!28687
| * | | | | Add changes to match eevrt-mr-update-ce-backportsarahghp2019-05-232-2/+2
| | | | | |
* | | | | | Merge branch '38561-border-radii' into 'master'Phil Hughes2019-05-243-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix border radii on diff files and repo files Closes #38483 and #38561 See merge request gitlab-org/gitlab-ce!28675
| * | | | | | Fix border radii on diff files and repo files38561-border-radiiAnnabel Dunstone Gray2019-05-233-1/+9
| | | | | | |
* | | | | | | Move avatar related styles to components directoryJacques Erasmus2019-05-244-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved all avatar related styles to the components directory
* | | | | | | Merge branch ↵Filipa Lacerda2019-05-242-12/+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-162-12/+7
| | | | | | | |
* | | | | | | | Merge branch 'js-18n-batch-comments' into 'master'Kushal Pandya2019-05-241-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n of batch_comments directory See merge request gitlab-org/gitlab-ce!28178
| * | | | | | | | I18N of batch_comments directoryjs-18n-batch-commentsBrandon Labuschagne2019-05-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | Remove un-used methodsThong Kuah2019-05-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods were used in emitting AUTO_DEVOPS_DOMAIN which has now been dropped.
* | | | | | | | | Stop emitting AUTO_DEVOPS_DOMAIN Ci variableThong Kuah2019-05-242-30/+1
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update documentation to reflect removal
* | | | | | | | Internationalisation of lib directoryBrandon Labuschagne2019-05-232-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | Fixes issue height of detail-page-headerErik van der Gaag2019-05-231-1/+0
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | detail-page-header-body class was making the height of the header 1 pixel too big to fit evenly
* | | | | | | Merge branch '59026-replace-favicon' into 'master'Phil Hughes2019-05-231-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new favicon for canary from next.gitlab.com Closes #59026 See merge request gitlab-org/gitlab-ce!28601
| * | | | | | | Add new favicon59026-replace-faviconJarek Ostrowski2019-05-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Added wrong favicon
* | | | | | | | 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
| | | | | | | | |
* | | | | | | | | Merge branch '49041-issue-board-input-height' into 'master'Phil Hughes2019-05-231-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce height of issue board input to align with buttons Closes #49041 See merge request gitlab-org/gitlab-ce!28604
| * | | | | | | | | Reduce height of issue board input to align with buttons49041-issue-board-input-heightAnnabel Dunstone Gray2019-05-221-1/+1
| | | | | | | | | |
* | | | | | | | | | Update smiley icons to new onesJarek Ostrowski2019-05-2311-29/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new emoji icons Remove added SVGs Change to sprite_icons Prettify Fix text left behind Fix errors Remove background top level reaction icon
* | | | | | | | | | Change system notes to use relative urlsLuke Picciau2019-05-231-6/+6
| | | | | | | | | |
* | | | | | | | | | 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-232-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-1/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '61393-emoji-button' into 'master'Filipa Lacerda2019-05-231-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default color of award emoji button Closes #61393 See merge request gitlab-org/gitlab-ce!28556
| * | | | | | | | Change default color of award emoji buttonAnnabel Dunstone Gray2019-05-221-1/+1
| | | | | | | | |
* | | | | | | | | Added a content field to atom feedDevin Sylva2019-05-221-0/+1
| | | | | | | | |
* | | | | | | | | Remove datapoint sorting from area chartAdriel Santiago2019-05-221-8/+8
| | | | | | | | |
* | | | | | | | | JupyterHub Repo IntegrationAmit Rathi2019-05-221-0/+9
| | | | | | | | |
* | | | | | | | | Fix loading.. dropdown at search fieldPavel Chausov2019-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #61313
* | | | | | | | | Merge branch ↵Douglas Barbosa Alexandre2019-05-221-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents' into 'master' Resolve "Performance issue: 502 errors on rendering of issues with heavy markdown contents" Closes #62116 See merge request gitlab-org/gitlab-ce!28597
| * | | | | | | | | Fix page_description helper performance62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contentsSean McGivern2019-05-221-1/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper is used for extracting part of the issue / MR / whatever description for use in the description meta tag: 1. To do that, we look at the source of the Markdown description. 2. We then strip out all HTML tags. 3. And then take the first 30 words. Doing that can be really slow - especially as Markdown is supposed to be treated as plain text. There are many better ways to do this, but the immediate performance fix is to swap steps 2 and 3. This does mean that the description may be less than 30 words (or even empty), but it is much faster when the description is very long.
* | | | | | | | | Merge branch 'increase-ci-queue-histogram-buckets' into 'master'Kamil Trzciński2019-05-221-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 60s and 5m values to the buckets used by prometheus to measure time Closes #62113 See merge request gitlab-org/gitlab-ce!28557
| * | | | | | | | Add 60s & 5m monitor buckets for CI queuesElliot Rushton2019-05-221-1/+1
| | | | | | | | |
* | | | | | | | | Update note actions icon colorJarek Ostrowski2019-05-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gray-600 for color Ensure passes accessibility reqs
* | | | | | | | | Merge branch 'graphql-tree' into 'master'Nick Thomas2019-05-229-0/+113
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Added repository files to GraphQL API See merge request gitlab-org/gitlab-ce!28325
| * | | | | | | | Added repository files to GraphQL APIPhil Hughes2019-05-229-0/+113
| | | | | | | | |