summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Internationalisation of groups directoryBrandon Labuschagne2019-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'sh-bump-chrome-v73-images' into 'master'Kushal Pandya2019-04-292-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade CI images to use Chrome V73 See merge request gitlab-org/gitlab-ce!27762
| * | | | | | Fix search dropdown being hidden immediatelyHeinrich Lee Yu2019-04-281-0/+2
| | | | | | |
| * | | | | | Gracefully handle undefined data in getTreeEntries()Stan Hu2019-04-281-0/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch '60855-mr-popover-is-not-attached-in-system-notes-jest-fix' ↵Filipa Lacerda2019-04-291-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Init MR Popovers on system note mounted Closes #60855 See merge request gitlab-org/gitlab-ce!27747
| * | | | | Init MR Popovers on system note mountedSam Bigelow2019-04-261-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | All `renderGFM()` calls are finished before the system note is mounted so this MR inits the popover for each system note, and only the elements in the system note
* | | | | Merge branch 'winh-boards-drag-selection' into 'master'Annabel Dunstone Gray2019-04-262-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent text selection when dragging in issue boards Closes #59378 See merge request gitlab-org/gitlab-ce!27724
| * | | | | Add vendor prefixes for user-selectWinnie Hellmann2019-04-262-0/+6
| | | | | |
* | | | | | Merge branch '3713-cross-project-environments-dashboard-mvc-backport' into ↵Filipa Lacerda2019-04-261-5/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport Environments Dashboard SCSS Changes See merge request gitlab-org/gitlab-ce!27498
| * | | | | Backport Environments Dashboard SCSS Changes3713-cross-project-environments-dashboard-mvc-backportAndrew Fontaine2019-04-241-5/+3
| | | | | |
* | | | | | Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into ↵Phil Hughes2019-04-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !27589
* | | | | | Resolve "Misalignment on suggested changes diff table"Natalia Tepluhina2019-04-261-2/+2
| | | | | |
* | | | | | Merge branch '46048-canary-next' into 'master'Phil Hughes2019-04-262-21/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds information about Canary environment Closes #46048 See merge request gitlab-org/gitlab-ce!27499
| * | | | | | Adds information about Canary env46048-canary-nextFilipa Lacerda2019-04-252-21/+26
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a badge to the navbar that indicates if Canary is being used When canary is not being used, it renders a link to next.gitlab.com
* | | | | | Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'Filipa Lacerda2019-04-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR Popover is not attached in system notes" Closes #60855 See merge request gitlab-org/gitlab-ce!27589
| * | | | | | Init MR Popovers onmount of system note60855-mr-popover-is-not-attached-in-system-notesSam Bigelow2019-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a bug where system notes had no MR Popovers
* | | | | | | Merge branch '60808-only-show-target-branch-advanced-error-before-merge' ↵Filipa Lacerda2019-04-261-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Don't show the "target branch advanced" error message after merge Closes #60808 See merge request gitlab-org/gitlab-ce!27588
| * | | | | | | Only show message when MR is open60808-only-show-target-branch-advanced-error-before-mergeNathan Friend2019-04-241-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug that was causing the "target branch has "advanced" error message to display after an MR was closed.
* | | | | | | Externalize strings in activity calendarVictor Wu2019-04-261-12/+12
| | | | | | |
* | | | | | | Use a FSM to determine application next stateEnrique Alcántara2019-04-266-134/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Separate cluster application UI state from server-side app status - Use a state machine to determine cluster application next state - Instead of using two variables to keep track of when an app is installing or updating, just use the app status property and control server-side and user events using the FSM service.
* | | | | | | Merge branch 'ce-fl-fix-missing-required-prop' into 'master'Phil Hughes2019-04-261-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Adds missing prop See merge request gitlab-org/gitlab-ce!27671
| * | | | | | | Adds missing propFilipa Lacerda2019-04-251-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'refactor/58827-migrate-issue-spec-to-jest' into 'master'Kushal Pandya2019-04-262-8/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrated issue spec files to Jest Closes #58827 See merge request gitlab-org/gitlab-ce!27673
| * | | | | | | refactor(issue): Refactored issue tests from Karma to JestMartin Hobert2019-04-252-8/+7
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re #58827 Added changelog Added sync false, and removed unneeded destroyers
* | | | | | | Merge branch 'migrate-import-projects-spec' into 'master'Kushal Pandya2019-04-263-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move import projects karma specs to jest Closes #60204 See merge request gitlab-org/gitlab-ce!27552
| * | | | | | Move import projects karma specs to jestLuke Bennett2019-04-253-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to the stability/validity of the specs.
* | | | | | | Implement toast componentJacques Erasmus2019-04-253-20/+8
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Implemented the toast component for success messages
* | | | | | Merge branch '11254-overflow-ce' into 'master'Kushal Pandya2019-04-251-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide ScopedBadge overflow notes See merge request gitlab-org/gitlab-ce!27651
| * | | | | | Hide ScopedBadge overflow notesRajat Jain2019-04-251-1/+3
| |/ / / / /
* | | | | | Add auto direction to support rtl languagesAhmad Haghighi2019-04-2512-1/+15
| |_|/ / / |/| | | |
* | | | | Merge branch 'kp-add-base-url-support-graphql' into 'master'Phil Hughes2019-04-251-3/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for baseUrl in ApolloClient instance within GraphQL helper See merge request gitlab-org/gitlab-ce!27657
| * | | | | Add support for baseUrl in ApolloClient instanceKushal Pandya2019-04-251-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for providing baseUrl/rootUrl within `uri` while creating ApolloClient instance.
* | | | | | Escape special characters in GFM auto complete highlightingJan Beckmann2019-04-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #60552
* | | | | | Merge branch '60687-enviro-dropdown' into 'master'Fatih Acet2019-04-242-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
| * | | | | | Fix Metrics environments dropdown60687-enviro-dropdownSimon Knox2019-04-242-1/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Also bring back EE dashboard component
* | | | | | Merge branch 'fix-api-ide-relative-url-root' into 'master'Fatih Acet2019-04-243-10/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fix API and IDE path with `/` relative_url_root See merge request gitlab-org/gitlab-ce!27635
| * | | | | Fix API and IDE path with `/` relative_url_rootPaul Slaughter2019-04-243-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** Previously we simply concatenated our paths, which led to requesting `//api/v4/...` and obviously failed. The BE supports a relative_url_root of `/`. It's a bug that the FE does not.
* | | | | | Merge branch '60387-use-icons-in-user-popovers' into 'master'Tim Zallmann2019-04-242-4/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show category icons in user popover Closes #60387 See merge request gitlab-org/gitlab-ce!27254
| * | | | | Show category icons in user popoverKushal Pandya2019-04-222-4/+21
| | |/ / / | |/| | | | | | | | | | | | | Show bio, organization and location icons within user popover.
* | | | | Resolve "Merge Request Popover is not working on the To Do page"Sam Bigelow2019-04-241-7/+8
| | | | |
* | | | | Move EE differences for `ready_to_merge.vue`Natalia Tepluhina2019-04-242-9/+15
| | | | |
* | | | | Merge branch '10096-gfm-autocomplete-ce' into 'master'Kushal Pandya2019-04-245-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move EE specific GfmAutocomplete code to EE file See merge request gitlab-org/gitlab-ce!27611
| * | | | | Move EE specific GfmAutocomplete code to EE file10096-gfm-autocomplete-ceRajat Jain2019-04-245-6/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Refactor GfmAutocomplete and create a new EE counterpart which is referenced through `ee_else_ce`
* | | | | Merge branch 'ide-create-commit-action-types-constant' into 'master'Phil Hughes2019-04-242-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create constants for IDE commit action values See merge request gitlab-org/gitlab-ce!27613
| * | | | | Create constants for IDE commit action valuesPaul Slaughter2019-04-242-4/+13
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** These values will be used to help build the mirroring diff. It is helpful keeping it controlled in a constant. **Links:** - https://gitlab.com/gitlab-org/gitlab-ee/issues/10232 - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
* | | | | Merge branch '59831-related-items-css-cleanup-ce' into 'master'Filipa Lacerda2019-04-242-95/+24
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Remove related items CSS properties and add utility classes See merge request gitlab-org/gitlab-ce!27583
| * | | | Remove related items CSS properties and add utility classes59831-related-items-css-cleanup-ceAnnabel Dunstone Gray2019-04-232-95/+24
| |/ / /
* | | | Fix issue with list label text colorTucker Chapman2019-04-231-0/+1
| | | |
* | | | Merge branch 'resolve-ee-ce-diff-of-noteable-discussion' into 'master'Phil Hughes2019-04-231-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve EE / CE diff of noteable_discussion See merge request gitlab-org/gitlab-ce!27562
| * | | | Resolve EE / CE diff of noteable_discussionresolve-ee-ce-diff-of-noteable-discussionPaul Slaughter2019-04-221-1/+6
| | | | |