summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Update `gitlab` npm namespaceGeorge Tsiolis2018-11-213-6/+7
|
* Add `hover` on button tooltipsGeorge Tsiolis2018-11-213-6/+4
| | | | See https://gitlab.com/gitlab-org/gitlab-ui/issues/89
* Remove the tooltip trigger suffixGeorge Tsiolis2018-11-211-1/+1
|
* Restore tooltip placement propGeorge Tsiolis2018-11-211-0/+5
|
* Remove redundant specs for tooltipGeorge Tsiolis2018-11-211-10/+1
|
* Replace tooltip directive with gl-tooltip directive in badges, cycle ↵George Tsiolis2018-11-216-27/+19
| | | | analytics, and diffs
* Merge branch '54230-eliminate-duplicated-words-in-apps' into 'master'Rémy Coutable2018-11-212-2/+2
|\ | | | | | | | | | | | | Eliminate duplicated words (in apps) Closes #54230 See merge request gitlab-org/gitlab-ce!23184
| * Eliminate duplicated wordsTakuya Noguchi2018-11-222-2/+2
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Reinstate changes from MR 23234reinstate-d5a24021a4e583Yorick Peterse2018-11-212-3/+7
| | | | | | | | | | | | | | | | This reinstates the changes added in MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23234. I was testing a script that was supposed to operate on a fork of CE (yorickpeterse/gitlab-ce), but it was operating on gitlab-org/gitlab-ce by accident.
* | Revert "Merge branch 'ide-open-all-mr-files' into 'master'"Yorick Peterse2018-11-212-7/+3
| | | | | | This reverts merge request !23234
* | Merge branch '54282-tooltip-stuck' into 'master'Phil Hughes2018-11-211-4/+4
|\ \ | |/ |/| | | | | | | | | Fixes stuck tooltip on stop env button Closes #53571 and #54282 See merge request gitlab-org/gitlab-ce!23244
| * Merge branch 'master' into 54282-tooltip-stuck54282-tooltip-stuckFilipa Lacerda2018-11-21385-6106/+2047
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Adds a PHILOSOPHY.md Externalize strings from `/app/views/abuse_reports` Fix Issuable container element selector for shortcuts handling Enable Rubocop on lib/gitlab Add user docs for Pages access control Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571 Align issue status label and confidential icon Externalize strings from `/app/views/repository_check_mailer` Remove instances of `@extend .monospace` Resolve "The reply shortcut can add any text of the page to the "comment" text area" Upgrade escape_utils to 1.2.1 Add dedicated runner tags to assets job Upgrade gitlab eslint config to latest Fix broken karma specs Disable conflicting eslint rules Prettify all the things Upgrade prettier to 1.15.2 Added a test for open merge request files Update CHANGELOG.md for 11.4.7 Open first 10 merge request files in IDE ...
| * | Fixes stuck tooltip on stop env buttonFilipa Lacerda2018-11-201-4/+4
| | | | | | | | | | | | | | | | | | Used the glTooltipdirective to fix the tooltip on the stop environment button in the mr widget getting stuck when the element is not in hover state
* | | Merge branch '53578-fe-deployment-status' into 'master'Phil Hughes2018-11-211-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Adds missing status in deployment widget See merge request gitlab-org/gitlab-ce!23239
| * | | Adds missing status in deployment widget53578-fe-deployment-statusFilipa Lacerda2018-11-201-0/+2
| | | | | | | | | | | | | | | | Renders created and canceled status in MR widget
* | | | Merge branch '52453-show-subgroups-in-group-create-issue' into 'master'Sean McGivern2018-11-212-4/+18
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Resolve "Access project from descendent groups when selecting project to create new issue" Closes #47096 and #52453 See merge request gitlab-org/gitlab-ce!22612
| * | | Prettify JSHeinrich Lee Yu2018-11-192-9/+15
| | | |
| * | | Change param name for consistencyHeinrich Lee Yu2018-11-192-3/+3
| | | |
| * | | Update project selection dropdown API paramsHeinrich Lee Yu2018-11-192-1/+9
| | | |
* | | | Fix Issuable container element selector for shortcuts handlingKushal Pandya2018-11-211-1/+1
| | | |
* | | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2018-11-21374-6072/+1987
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade prettier to v1.15.2 See merge request gitlab-org/gitlab-ce!22893
| * | | | Prettify all the thingsMike Greiling2018-11-20374-6072/+1987
| | |_|/ | |/| |
* | | | Align issue status label and confidential iconGeorge Tsiolis2018-11-203-7/+4
| | | |
* | | | Remove instances of `@extend .monospace`George Tsiolis2018-11-204-20/+0
| | | |
* | | | Resolve "The reply shortcut can add any text of the page to the "comment" ↵Thomas Pathier2018-11-202-5/+50
| | | | | | | | | | | | | | | | text area"
* | | | Merge branch 'ide-open-all-mr-files' into 'master'Filipa Lacerda2018-11-202-3/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Open first 10 merge request files in IDE Closes #51635 See merge request gitlab-org/gitlab-ce!23234
| * | | Added a test for open merge request filesPhil Hughes2018-11-201-1/+1
| | | |
| * | | Open first 10 merge request files in IDEPhil Hughes2018-11-202-2/+6
| | |/ | |/| | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
* | | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-11-205-1/+342
|\ \ \ | |/ / |/| | | | | | | | | | | | | | SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982
| * | SSH public-key authentication for push mirroringNick Thomas2018-11-195-1/+342
| |/
* | Merge branch 'image-diff-size-fix' into 'master'Filipa Lacerda2018-11-204-35/+12
|\ \ | | | | | | | | | | | | | | | | | | Fixed the dimensions of image diffs Closes #54236 See merge request gitlab-org/gitlab-ce!23195
| * | Fixed the dimensions of image diffsPhil Hughes2018-11-204-35/+12
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54236
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSteve Azzopardi2018-11-201-4/+11
|\ \
| * \ Merge branch 'security-2717-xss-username-autocomplete' into 'master'Steve Azzopardi2018-11-201-4/+11
| |\ \ | | | | | | | | | | | | | | | | [master] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2605
| | * | Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-121-4/+11
| | | |
* | | | Resolve "Further UI improvements to Profile "Overview" tab"Martin Wortschack2018-11-202-57/+58
| | | |
* | | | Refine cursor positioning in Markdown Editor for wrap tags.Johann Hubert Sonntagbauer2018-11-201-8/+3
| | | |
* | | | Merge branch 'gt-fix-typo-in-notebook-props' into 'master'Fatih Acet2018-11-193-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix typo in js (props, specs) See merge request gitlab-org/gitlab-ce!23103
| * | | Fix typos in comments for jsGeorge Tsiolis2018-11-153-3/+3
| | | |
| * | | Fix typo in notebook propsGeorge Tsiolis2018-11-151-1/+1
| | | |
* | | | Merge branch '52385-search-bar-for-dashboard-list' into 'master'Sean McGivern2018-11-194-23/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search filter bar for issues dashboard list" Closes #53584, #52430, and #52385 See merge request gitlab-org/gitlab-ce!22641
| * | | | Clean up page_filter_pathHeinrich Lee Yu2018-11-131-1/+3
| | | | |
| * | | | Fix testsHeinrich Lee Yu2018-11-131-5/+4
| | | | |
| * | | | Remove unused legacy filter initHeinrich Lee Yu2018-11-131-14/+0
| | | | |
| * | | | Apply new search bar on issues and merge request dashboardsHeinrich Lee Yu2018-11-132-4/+16
| | | | |
* | | | | Don't show memory usage graph for unmerged MRsSimon Knox2018-11-192-1/+10
| | | | |
* | | | | Merge branch 'fix-not-render-emoji' into 'master'Mike Greiling2018-11-191-4/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix not render emoji in filter dropdown See merge request gitlab-org/gitlab-ce!23112
| * | | | Fix not render emoji in filter dropdownHiroyuki Sato2018-11-151-4/+7
| | |/ / | |/| |
* | | | Use @gitlab npm namespaceClement Ho2018-11-16103-105/+105
| | | |
* | | | Merge branch 'gt-rename-diffs-store-variable' into 'master'Phil Hughes2018-11-162-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename diffs store variable See merge request gitlab-org/gitlab-ce!23123