summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-textNathan Friend2019-08-144-8/+10
| | | | | | | | | | This commit adds a helper text that describes what will happen when a user clicks the "Start/Add to merge train when pipeline succeeds" button. This text appears at the bottom of the merge request widget. In addition, this commit renames the "merge_train_info" component to "merge_train_position_indicator" to avoid ambiguity with the "merge_train_helper_text" component.
* Fixed border styles for calloutAishwarya Subramanian2019-08-141-1/+7
|
* Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' ↵Kushal Pandya2019-08-141-2/+0
| | | | | | into 'master'" This reverts merge request !30808
* Fix style-lint errors in wiki.scssHimanshu Kapoor2019-08-141-17/+0
| | | | | | | | | There were two errors: duplicate styles and @extend used with a class name. I added `.top-area` class to all the instances where `.wiki-page-header` is used since %top-area didn't really make a lot of sense as a placeholder selector. This is also consistent with behaviour on other pages where the `.top-area` class is used alongside the other classes for the specific header styling.
* Add notification for updated privacy policyDennis Tang2019-08-141-0/+2
| | | | | | | | This adds a notification to let users know of our updated privacy policy. Users can dismiss the notification either by following the link or closing the notification via an "x" icon.
* Merge branch 'ce-nfriend-fix-the-merge-button' into 'master'Filipa Lacerda2019-08-142-5/+5
|\ | | | | | | | | CE backport for gitlab-org/gitlab-ee!14894: Fix the merge button dropdown See merge request gitlab-org/gitlab-ce!31248
| * Fix merge button dropdown (CE)ce-nfriend-fix-the-merge-buttonNathan Friend2019-08-122-5/+5
| | | | | | | | | | | | | | This commit fixes an issue that was causing the merge button dropdown trigger to be shown even if the dropdown itself was hidden. This commit also fixes an issue that caused the "Merge Immediately" option not to be available when merge trains were enabled.
* | Fix typoArun Kumar Mohan2019-08-121-1/+1
| |
* | FE fetch counts async on search page loadPaul Slaughter2019-08-122-0/+26
| | | | | | | | | | Creates `refresh_counts` module to dynamically fetch and load data based on attributes of HAML elements.
* | Merge branch '65790-highlight' into 'master'Annabel Dunstone Gray2019-08-122-0/+21
|\ \ | | | | | | | | | | | | | | | | | | Adds highlight to collapsible line in job log Closes #65790 See merge request gitlab-org/gitlab-ce!31665
| * | Adds highlight to collapsible lineFilipa Lacerda2019-08-122-0/+21
| | | | | | | | | | | | | | | In the job log adds a highlight when hovering the collapsible line
* | | Resolve "Add externalization and fix regression in shortcuts helper modal"Thomas Randolph2019-08-121-0/+2
| |/ |/|
* | Merge branch '61332-web-ide-mr-branch-dropdown-closes-unexpectedly' into ↵Kushal Pandya2019-08-123-31/+26
|\ \ | |/ |/| | | | | | | | | | | | | 'master' Resolve "Web IDE MR/branch dropdown closes unexpectedly" Closes #61332 See merge request gitlab-org/gitlab-ce!31523
| * Reduce the default height of MR/branch dropdowns61332-web-ide-mr-branch-dropdown-closes-unexpectedlyHimanshu Kapoor2019-08-093-7/+6
| | | | | | | | | | | | | | To avoid having empty areas in the dropdown that occupy unnessary space, I removed the dropdown's min-height and changed its default height in empty state to be same as its loading state (with the spinner).
| * Focus on the input when clicked outside the inputHimanshu Kapoor2019-08-093-28/+24
| | | | | | | | | | | | | | | | | | | | Fixed in MR list and branch list components. Earlier clicking right outside the input box closed the dropdown, which was unexpected behaviour. To make it consistent with the behaviour of select2 jquery plugin, I have made clicking outside the input focus on the input by using a label.
* | Merge branch ↵docs-4453-external-exportersFilipa Lacerda2019-08-121-1/+4
|\ \ | | | | | | | | | | | | | | | | | | '44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master' Fix incorrectly displayed conflict warning See merge request gitlab-org/gitlab-ce!31469
| * | Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lieHeinrich Lee Yu2019-08-121-1/+4
| | | | | | | | | | | | Hide warning when update request is in progress
* | | Merge branch 'sh-break-out-invited-group-members' into 'master'Ash McKenzie2019-08-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make it easier to find invited group members Closes #61948 See merge request gitlab-org/gitlab-ce!28436
| * \ \ Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-0983-310/+554
| |\ \ \
| * | | | Resolve first round of discussionsMartin Wortschack2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid splitting sentences - Update PO file - Utilize $input-height - Replace pr- with mr-
| * | | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-0723-81/+201
| |\ \ \ \
| * | | | | Fix broken specsMartin Wortschack2019-08-061-4/+0
| | | | | | | | | | | | | | | | | | - Add qa- selector to sort dropdown
| * | | | | Fix CSS for mobileMartin Wortschack2019-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings - Update PO file
* | | | | | Resolve "GDK error on non-unique GraphQL fragment 'PageInfo'"Natalia Tepluhina2019-08-122-5/+6
| | | | | |
* | | | | | Merge branch 'fe-fix-diffs-specs-leaking-store' into 'master'Kushal Pandya2019-08-122-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] FE fix diffs specs leaking store See merge request gitlab-org/gitlab-ce!31698
| * | | | | | CE - FE fix diffs specs leaking storefe-fix-diffs-specs-leaking-storePaul Slaughter2019-08-112-3/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Export mr_notes module as function - Update specs refs of mr_notes/stores to factory EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15097
* | | | | | Add kbd shortcuts for discussion navigationSam Bigelow2019-08-124-10/+71
|/ / / / / | | | | | | | | | | | | | | | Add keyboard shortcuts `p` and `n` to navigate duscussions.
* | | | | Update karma for new expansion cell markupAndré Luís2019-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleans up spec by: - Add missing `afterEach ... $destroy` - Add missing `done` call when `$nextTick` was used
* | | | | Replace ... with new expansion optionsSamantha Ming2019-08-1013-102/+495
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - expand upwards - expand downwards - expand all in both inline and parallel views
* | | | | Split MR widget into cached and non-cached serializersIgor2019-08-093-48/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits auto-refreshing of MR widget into 2 requests: - the one which uses etag-caching and invalidates the fields on change - the one without caching The idea is to gradually move all the fields to etag-cached endpoint
* | | | | Remove gfm_embed_metrics flag from BETristan Read2019-08-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the feature flag that controls whether metrics dashboard urls unfurl the metrics dashboard charts.
* | | | | Adds button to download metrics data as csvLaura Montemayor2019-08-096-4/+41
| |_|/ / |/| | | | | | | | | | | | | | | | | | | This MR adds a temporary button to be able to download the Prometheus metrics from charts to CSV format.
* | | | Add repo-refs control for search pageminghuan lei2019-08-093-12/+26
| | | | | | | | | | | | | | | | - only in blobs result
* | | | Merge branch 'fix-job-log-formatting' into 'master'Filipa Lacerda2019-08-091-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job log where spans were displayed in block Closes #65686 See merge request gitlab-org/gitlab-ce!31674
| * | | | Fix job log where spans were displayed in blockfix-job-log-formattingFabio Pitino2019-08-091-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary, not ideal, solution but it fixes the main issue that the customer are complaining about, which is that color changes are broken down in several lines which makes the log not readable.
* | | | | Improve layout of dropdowns in metrics pageMiguel Rincon2019-08-092-102/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure layout works on xs and sm screens Add check in case buttons are not present Apply Prettier to file Remove unused class and div, reduce margins
* | | | | Resolve "Add tooltip to improve clarity of "detached" label/state in the ↵Nick Kipling2019-08-091-1/+5
|/ / / / | | | | | | | | | | | | merge request pipeline"
* | | | Merge branch 'visual-review-tools-constant-storage-keys' into 'master'Paul Slaughter2019-08-098-16/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Visual review app gitlab storage keys See merge request gitlab-org/gitlab-ce!31427
| * | | | Visual review app gitlab storage keysvisual-review-tools-constant-storage-keysshampton2019-08-028-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move away from using generic LocalStorage and SessionStorage keys which could be used by the customer for their own application.
* | | | | Shrink size of please register or sign in boxMarcel van Remmerden2019-08-091-1/+1
| | | | |
* | | | | Revert "Merge branch ↵Winnie Hellmann2019-08-091-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '4221-board-milestone-should-persist-any-none-properly-ce' into 'master'" This reverts merge request !30613
* | | | | Remove duplicate button to add new metricsMiguel Rincon2019-08-091-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove "new metrics" duplicated button and replace with a message - Replace css with utility classes in the prometheus metrics view - Remove unused css
* | | | | Merge branch 'no-oxygen' into 'master'Annabel Dunstone Gray2019-08-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace Oxygen-Sans with Noto Sans font on visual_review_toolbar See merge request gitlab-org/gitlab-ce!31561
| * | | | | Prefer Noto Sans fontAlexander Oleynikov2019-08-071-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '63181-collapsible-line' into 'master'Kushal Pandya2019-08-081-14/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes section title clickable and collapsible Closes #63181 See merge request gitlab-org/gitlab-ce!31571
| * | | | | Makes title section collapsible63181-collapsible-lineFilipa Lacerda2019-08-071-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the job log, if the user clicks the section title the job log section will be collapsed
* | | | | | FE for group level Cycle AnalyticsBrandon Labuschagne2019-08-082-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds the code which displays cycle analytics on a group level. It reuses the cycle_analytics_bundle file which will later be removed. This feature is currently behind the analytics feature flag.
* | | | | | Merge branch '62609-test-summary-loading-spinner-is-too-large' into 'master'Mike Greiling2019-08-082-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust size and align MR-widget loading icon Closes #62609 See merge request gitlab-org/gitlab-ce!31503
| * | | | | | Adjust size and align MR-widget loading icon62609-test-summary-loading-spinner-is-too-largeDave Pisek2019-08-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change within gitlab-ui introduced a new size (24x24) and changed also some of the existing sizes. This commit uses the loading-icon's new size (24x24) to bring it to the same dimensions as the status-icon and applies some styling to vertically align them.
* | | | | | | Disable vue-i18n for non-autofix filesEzekiel Kigbo2019-08-0845-14/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disables the vue-i18n eslint rules for files that are not able to be autofixed, this will stop these offences causing pipeline failures but they will need manual fixing.