summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' ↵59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantitiesMike Greiling2019-04-031-23/+25
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Show download diff even when merge request is closed" Closes #29249 See merge request gitlab-org/gitlab-ce!26772
| * Show Download diff links in closed MRs29249-show-download-diff-even-when-merge-request-is-closedFatih Acet2019-04-031-23/+25
| | | | | | | | | | Download MR diffs links were only available for open MRs, however it may still be useful for closed MRs.
* | Replace 'x seconds ago' with 'just now'Sergiu Marton2019-04-031-3/+7
| |
* | Merge branch '13784-validate-variables-for-masking' into 'master'Clement Ho2019-04-032-2/+33
|\ \ | | | | | | | | | | | | Simple masking frontend - CE See merge request gitlab-org/gitlab-ce!26751
| * | Add control for variable value maskingmfluharty2019-03-292-2/+33
| | | | | | | | | | | | | | | | | | Show masked switch for each variable When toggled on, the variable value will be masked in runner logs Show warning message if the switch is on but the value is not maskable
* | | Localize the notifications dropdown stringJacques Erasmus2019-04-031-1/+2
| | | | | | | | | | | | Localized the notifications dropdown string
* | | Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'Nick Thomas2019-04-031-4/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove reply_to_individual_notes feature flag Closes #58644 See merge request gitlab-org/gitlab-ce!26889
| * | | Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-031-4/+1
| | |/ | |/| | | | | | | Also removes specs related to the flag
* | | MR image diff swipe view: Disable user-select on dragftab2019-04-032-4/+8
| | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59942
* | | Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵Kieran Andrews2019-04-031-2/+4
| | | | | | | | | | | | into feature/webide_escaping
* | | Extend timezone dropdownEzekiel Kigbo2019-04-032-26/+33
| | | | | | | | | | | | | | | Adds optional paramters to the constructor to allow reuse of the timezone dropdown on other pages
* | | Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'Filipa Lacerda2019-04-031-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
| * | | Fixes duplicate diff too large error messagesPhil Hughes2019-04-021-4/+0
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* | | | Merge branch '47771-highlighting-in-diff' into 'master'Tim Zallmann2019-04-031-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled text selection in diffs in Web IDE Closes #47771 See merge request gitlab-org/gitlab-ce!26721
| * | | | Enabled text selection in diffs in Web IDE47771-highlighting-in-diffDenys Mishunov2019-03-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/47771 Changelog entry
* | | | | Merge branch 'patch-49' into 'master'Phil Hughes2019-04-031-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix comment typo in noteable_note.vue See merge request gitlab-org/gitlab-ce!26855
| * | | | Fix comment typoSergiu Marton2019-04-021-1/+1
| | |/ / | |/| |
* | | | Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into ↵Mike Greiling2019-04-022-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Set the size of instance system message text 12px" Closes #59131 See merge request gitlab-org/gitlab-ce!26293
| * | | | Remove duplicate declaration of $system-header-height59131-set-the-size-of-instance-system-message-text-12pxDennis Tang2019-04-021-1/+0
| | | | |
| * | | | Update system message banner font size to 12pxDennis Tang2019-04-021-0/+1
| | | | |
* | | | | Remove non-functional add issue button on welcome listDonald Cook2019-04-022-2/+5
| | | | |
* | | | | Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'Robert Speicher2019-04-022-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Jarv/dev to gitlab 2019 04 02 Closes #2810 See merge request gitlab-org/gitlab-ce!26846
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-022-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jarv/dev-to-gitlab-2019-04-02
| | * \ \ \ Merge branch 'security-56224' into 'master'GitLab Release Tools Bot2019-04-021-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!2996
| | | * | | | Hide related branches when user does not have permissionMark Chao2019-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Guest user of a project should not see branches
| | * | | | | Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'GitLab Release Tools Bot2019-04-021-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PDF.js vulnerability See merge request gitlab/gitlabhq!2999
| | | * | | | | fix: changed PDFJS prop to GlobalWorkerOptionsNatalia Tepluhina2019-03-131-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'diff-tree-mobile-bug' into 'master'Filipa Lacerda2019-04-021-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed positioning of the diff tree list on mobile Closes #59739 See merge request gitlab-org/gitlab-ce!26820
| * | | | | | | Fixed positioning of the diff tree list on mobilePhil Hughes2019-04-021-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59739
* | | | | | | CE backport of design-management-upload-clientPhil Hughes2019-04-021-7/+12
|/ / / / / /
* | | | | | Merge branch 'nfriend-css-updates-for-gitlab-design-system-compliance' into ↵Fatih Acet2019-04-012-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update border radius of form controls and remove space above page titles See merge request gitlab-org/gitlab-ce!24497
| * | | | | | Update border radius of form controls and remove space above page titlesnfriend-css-updates-for-gitlab-design-system-complianceNathan Friend2019-02-142-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes changes to global CSS styles to bring the product closer to compliance with Pajamas (the GitLab design system).
* | | | | | | Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'Clement Ho2019-04-013-23/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where clicking file header in diff refreshes page Closes #57669 See merge request gitlab-org/gitlab-ce!26422
| * | | | | | | Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-pageSam Bigelow2019-03-293-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an ID to the diff content - handle clicking on file name in diffFileHeader when it is not a link to another page but rather a link to an element on the page
* | | | | | | | Merge branch '59694-markdown-area' into 'master'Phil Hughes2019-04-012-5/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styleling for `app/assets/stylesheets/framework/markdown_area.scss` See merge request gitlab-org/gitlab-ce!26768
| * | | | | | | | Replaces md-area with position-relative for markdown areasFilipa Lacerda2019-04-012-5/+1
| | | | | | | | |
* | | | | | | | | Remove executable permission on imagessh-fix-image-permissionsStan Hu2019-03-303-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/187433314
* | | | | | | | | Merge branch 'dennis-positioning-important' into 'master'Clement Ho2019-03-291-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Designate common positioning classes as `!important` a la Bootstrap See merge request gitlab-org/gitlab-ce!26621
| * | | | | | | | | Designate common positioning classes as important a la Bootstrapdennis-positioning-importantDennis Tang2019-03-261-4/+4
| | | | | | | | | |
* | | | | | | | | | Handle missing keys in sentry api responseReuben Pereira2019-03-291-1/+1
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not raise error when there are missing non-essential keys in sentry api response. - Add specs for to check for missing keys behavior.
* | | | | | | | | Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master'Nick Thomas2019-03-293-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 1607-elastic_feature_flag_per_group See merge request gitlab-org/gitlab-ce!25825
| * | | | | | | | | Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_groupMario de la Ossa2019-03-283-0/+0
| | | | | | | | | |
* | | | | | | | | | Adds EE validators to CE fileSarah Groff Hennigh-Palermo2019-03-291-0/+6
| | | | | | | | | |
* | | | | | | | | | Add requested resources to cluster health - ce portTristan Read2019-03-292-6/+5
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Don't cutoff letters in MR and Issue linksgfyoung2019-03-281-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch '24936-remove-type-from-review-app-name' into 'master'Mike Greiling2019-03-281-10/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant group name from environment name on the "Environments" page Closes #24936 See merge request gitlab-org/gitlab-ce!25600
| * | | | | | | | Remove folder from environment nameNathan Friend2019-03-181-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, environments grouped together in a "folder" would include the folder name in the UI. This information was unnecessary since the folder is also shown in the UI. In addition, this commit also makes some minor changes to how tooltips are displayed for both environments and folders.
* | | | | | | | | Merge branch ↵Phil Hughes2019-03-281-13/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master' Remove EE differences for monitoring dashboard See merge request gitlab-org/gitlab-ce!26574
| * | | | | | | | | Remove EE differences for monitoring dashboardSimon Knox2019-03-271-13/+35
| | | | | | | | | |
* | | | | | | | | | Merge branch '59079-fix-jupyter-render-loop' into 'master'Phil Hughes2019-03-281-14/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix jupyter rendering bug that ended in an infinite loop Closes #59079 See merge request gitlab-org/gitlab-ce!26667