summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '41570-max-height-dropdown' into 'master'Phil Hughes2018-01-095-11/+7
|\ | | | | | | | | | | | | Resolve "Download menu expands past the fold and doesn't auto size to the bottom height of the browser window" Closes #41570 See merge request gitlab-org/gitlab-ce!16299
| * Change max-height of all dropdowns to 312px41570-max-height-dropdownAnnabel Dunstone Gray2018-01-085-11/+7
| |
* | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-091-3/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
| * | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-091-3/+1
| | | | | | | | | | | | Closes #41561
* | | Fixing re-ordering of an issue when dragging it to the bottom a long issue ↵David Kuri2018-01-091-1/+1
| | | | | | | | | | | | list in the board
* | | Merge branch 'move-markdown-preview' into 'master'Phil Hughes2018-01-093-184/+182
|\ \ \ | | | | | | | | | | | | | | | | Remove preview_markdown from the global obj See merge request gitlab-org/gitlab-ce!16025
| * | | Remove preview_markdown from the global objJacob Schatz2018-01-093-184/+182
| | | |
* | | | Merge branch '41404-pipelines-charts' into 'master'Phil Hughes2018-01-092-6/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Pipeline graph uses inconsistent colors for its legend and its content" Closes #41404 See merge request gitlab-org/gitlab-ce!16260
| * | | Change pipeline charts colors to match legend41404-pipelines-chartsAnnabel Dunstone Gray2018-01-082-6/+14
| | | |
* | | | Refactor dashboard todos inside dispatcherClement Ho2018-01-083-6/+9
| |_|/ |/| |
* | | Merge branch 'fix/remove-unnecessary-dashboard-scroll' into 'master'Annabel Dunstone Gray2018-01-081-4/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unnecessary dashboard scroll See merge request gitlab-org/gitlab-ce!16213
| * | | Remove unnecessary dashboard scrollGeorge Tsiolis2018-01-041-4/+0
| | | |
* | | | Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-082-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "No Rendering of emoji's in Group-Overview after update" Closes #40549 See merge request gitlab-org/gitlab-ce!16098
| * | | | Rendering of emoji's in Group-OverviewJacopo2017-12-242-2/+3
| | | | | | | | | | | | | | | | | | | | Allows rendering of emoji's in the Group Overview.
* | | | | Merge branch '38056-remove-unused-option' into 'master'Phil Hughes2018-01-081-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused push_code_to_protected_branches Closes #38056 See merge request gitlab-org/gitlab-ce!16253
| * | | | | Remove unused push_code_to_protected_branches38056-remove-unused-optionLin Jen-Shin2018-01-051-2/+0
| | | | | |
* | | | | | Resolve "Add graph value to hover"Mike Greiling2018-01-086-200/+257
| | | | | |
* | | | | | Fix slash commands dropdown descriptionMaurizio De Santis2018-01-082-3/+15
| |_|_|_|/ |/| | | |
* | | | | Merge branch '22643-manual-job-page' into 'master'Kamil Trzciński2018-01-063-7/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve non-triggered manual action job detail page" Closes #22643 and #37843 See merge request gitlab-org/gitlab-ce!15991
| * | | | | Changes after reviewFilipa Lacerda2018-01-052-5/+5
| | | | | |
| * | | | | Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-051-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Allow local tests to use a modified Gitaly Update check.md add deprecation and removal issue to docs Add status attribute to runner api entity Fix typos in a code comment Just try to detect and assign once Modify `LDAP::Person` to return username value based on attributes Create Kubernetes based on Application Templates Fix a bug where charlock_holmes was used needlessly to encode strings Ignore the Migration/Datetime cop in a migration that fix a column type to datetime_with_timezone Use `__` instead of `s__` when context is not required Enclose props in quotes Update some Gitaly annotations in Gitlab::Shell Prepare Gitlab::Git::Repository#rebase for Gitaly migration add missing changelog refactor spec, add docs deprecate check integrity task add lock specs add locks chek remove max-depth flag so it works with subgroups ...
| * | | | | | Update svg iconsFilipa Lacerda2018-01-042-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-0466-567/+1619
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (200 commits) Fix issue boards scroll config. Added multi editor setting on the profile preferences page fix missing import of timeWeek which would cause errors in prometheus graphs with deployments Remove downcase from special path helper Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql} Fix error when viewing diffs without blobs Moves prettier to dev dependency Eager load event target authors whenever possible Do not run ee_compat_check on security branches Include integration tests in CE/EE testing documentation 41054-Disallow creation of new Kubernetes integrations Resolve "Resizable file list and commit panel" Make tooltip placement bottom by default as per design guidelines Fix groups list icon, timestamp alignment and row height Avoid leaving a push event empty if payload cannot be created Move git operations for UpdateRemoteMirrorService into Gitlab::Git Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Update Kubernetes service documentation fix issue #37843 ...
| * \ \ \ \ \ \ Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2017-12-2218-21/+91
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (22 commits) Extend Cluster Applications to allow installation of Prometheus Docs: move article LDAP-CE to its topic-related folder Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 Execute project hooks and services after commit when moving an issue Use relative URLs when linking to uploaded files Use gitlab-styles Clarify Auto DevOps pipelines Make webpack fail for missing exports Update VERSION to 10.4.0-pre Update CHANGELOG.md for 10.3.0 Explictly require Gitlab::Utils in ProjectFeaturesCompatibility Add note about using the term GPG for all related implementations Add index on namespaces lower(name) for UsersController#exists docs: fix a typo in LFS documentation Fix prometheus arg in prometheus.yml Update Dependencies It should escape spaces to %20 rather than + Replaced the remaining code-fork icons code-fork replacements ...
| * \ \ \ \ \ \ \ Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2017-12-2286-1090/+2173
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (68 commits) Last push event widget width for fixed layout Added 'admin' persona Docs: move article Artifactory + GL to subject-related folder Mention GitLab Pages when changing username Consolidate the docs when changing a repo path Add docs for automatic redirects when renaming namespaces move "Transfer an existing project into a group" to project docs Do not show Vue pagination if only one page Resolve "Decouple multi-file editor from file list" Update Ruby version to 2.3.6 Skip projects filter on merge requests search Fall back to the `MergeRequestWidgetEntity` LDAP extern_uids are not normalized when updated via API organise content by subject Restore missing language code in datetime_utility.js Add support for defining explicit dependencies to QA factories Document mounting volumes with Docker-in-Docker add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml Use seconds where possible, and convert to milliseconds for Influxdb consumption update dispatcher to allow for dynamic imports until webpack plugin is updated ...
| * | | | | | | | | Adjust illustrations sizeFilipa Lacerda2017-12-201-4/+7
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2017-12-2021-88/+93
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (50 commits) Prevent some specs from mangling the gitlab-shell checkout Line up search dropdown with other nav dropdowns Fix onion-skin re-entering state Remove related links in MR widget when empty state Show inline edit button for issues Fix tags in the Activity tab not being clickable Fix shortcut links on help page Don't link LFS-objects multiple times. [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other Update axios.md Remove transitionend event from GL dropdown Preserve gem path so that we use the same gems Load commit in batches for pipelines#index BlobViewer::PackageJson - if private link to homepage Do not generate links for private NPM modules in blob view Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key migration Inverse the has_multiple_clusters? helper usage Remove block styling from search dropdown ...
| * | | | | | | | | | Adds illustrations for manual actions and non triggered jobsFilipa Lacerda2017-12-198-4/+22
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '41249-clearing-the-cache' into 'master'Kamil Trzciński2018-01-062-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clearing the cache" Closes #41249 See merge request gitlab-org/gitlab-ce!16067
| * | | | | | | | | | Use anchor instead of form for reset caches button41249-clearing-the-cacheMatija Čupić2018-01-061-3/+7
| | | | | | | | | | |
| * | | | | | | | | | Change reset_cache action from get to postMatija Čupić2018-01-051-4/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-0523-105/+342
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-0466-567/+1619
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2017-12-2299-1005/+2130
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Add reset cache button to pipelines viewMatija Čupić2017-12-212-0/+12
| | | | | | | | | | | |
* | | | | | | | | | | | Resolve "Helpful and instructing Empty state for multi file editor"Tim Zallmann2018-01-0511-43/+77
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'dm-copy-mermaid-as-gfm' into 'master'Jacob Schatz2018-01-052-1/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy Mermaid graphs as GFM Closes #41211 See merge request gitlab-org/gitlab-ce!16046
| * | | | | | | | | | | Copy Mermaid graphs as GFMdm-copy-mermaid-as-gfmDouwe Maan2018-01-052-1/+31
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'Fatih Acet2018-01-051-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox Closes #41563 See merge request gitlab-org/gitlab-ce!16244
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2018-01-0511-100/+98
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41563-fix-branch-creation-from-issue-in-firefox
| * | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox41563-fix-branch-creation-from-issue-in-firefoxEric Eastwood2018-01-041-4/+4
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41563 `event.srcElement` is non-standard, https://developer.mozilla.org/en-US/docs/Web/API/Event/srcElement
* | | | | | | | | | | | Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda2018-01-057-0/+154
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
| * | | | | | | | | | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-057-0/+154
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | | | | | | | | | | | Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master'Tim Zallmann2018-01-052-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of methods and components added in EE See merge request gitlab-org/gitlab-ce!16208
| * | | | | | | | | | | Use computed prop in expand buttonce-4348-show-dast-results-in-the-mr-widgetFilipa Lacerda2018-01-051-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Backport of methods and components added in EBackport of methods and ↵Filipa Lacerda2018-01-032-0/+55
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | components added in EEE
* | | | | | | | | | | Merge branch 'jivl-fix-import-project-url-bug' into 'master'Tim Zallmann2018-01-051-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import project url not updating project name Closes #40607 See merge request gitlab-org/gitlab-ce!16120
| * | | | | | | | | | | Fix import project url not updating project namejivl-fix-import-project-url-bugJose Ivan Vargas2018-01-031-3/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'winh-modal-target-id' into 'master'Filipa Lacerda2018-01-059-90/+87
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
| * | | | | | | | | | | Add id to modal.vue to support data-toggle="modal"Winnie Hellmann2018-01-059-90/+87
| | | | | | | | | | | |