Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cache document query41120-performance-bar-auto-scroll | Filipa Lacerda | 2018-01-02 | 1 | -2/+3 |
| | |||||
* | Merge branch 'master' into 41120-performance-bar-auto-scroll | Filipa Lacerda | 2018-01-02 | 88 | -1193/+2090 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (120 commits) Update CHANGELOG.md for 10.3.3 Fix user membership destroy relation Use heredoc so it's more clear Put all menus under menu module Introduce common project settings and just put Introduce Factory::Resource::DeployKey Introduce expand_deploy_keys Introduce Menu::Side Add documents for GitLab utilities Clears visual token on second backspace Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs. Add breadcrumbs to User Settings sub-views Rename asset sync related AWS variables Allow logged in user to change his password Fix 404 error after a user edits an issue description and solves the reCAPTCHA Fix links to old commits in merge requests Typos correction on the advise of @smcgivern Documenting that resolved JIRA tickets are not automatically transitioned Forking a project to a namespace with lower visibility. Keep typographic hierarchy in User Settings ... | ||||
| * | Clears visual token on second backspace | Martin Wortschack | 2018-01-02 | 1 | -15/+27 |
| | | |||||
| * | Resolve "Webpack Roadmap" | Constance Okoghenun | 2017-12-28 | 6 | -221/+212 |
| | | |||||
| * | Merge branch ↵ | Sean McGivern | 2017-12-28 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'show_proper_labels_in_board_issue_sidebar_when_issue_is_closed' into 'master' show None when issue is in closed list and no labels assigned Closes #40975 See merge request gitlab-org/gitlab-ce!15976 | ||||
| | * | remove the label | Christiaan Van den Poel | 2017-12-17 | 1 | -1/+0 |
| | | | |||||
| * | | Humanize the units of "Showing last X KiB of log" in job tracesh-make-kib-human | Stan Hu | 2017-12-27 | 1 | -2/+2 |
| | | | | | | | | | | | | Closes #38613 | ||||
| * | | Extend Cluster Applications to allow installation of Prometheus | Mayra Cabrera | 2017-12-22 | 4 | -0/+30 |
| | | | |||||
| * | | Merge branch 'jivl-general-icons-2' into 'master' | Tim Zallmann | 2017-12-22 | 6 | -16/+38 |
| |\ \ | | | | | | | | | | | | | | | | | Replace the download, fork and resolve discussion in a new issue icons See merge request gitlab-org/gitlab-ce!15436 | ||||
| | * | | Replaced the remaining code-fork iconsjivl-general-icons-2 | Jose Ivan Vargas | 2017-12-19 | 5 | -7/+22 |
| | | | | |||||
| | * | | code-fork replacements | Jose Ivan Vargas | 2017-12-19 | 1 | -5/+6 |
| | | | | |||||
| | * | | Replaced some fork icons instances and fixed the Icon component on the MR Widget | Jose Ivan Vargas | 2017-12-19 | 1 | -7/+7 |
| | | | | |||||
| | * | | replaced download icon for the sprite based one | Jose Ivan Vargas | 2017-12-19 | 2 | -6/+12 |
| | | | | |||||
| * | | | Merge branch '33609-hide-pagination' into 'master' | Clement Ho | 2017-12-21 | 1 | -1/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show Vue pagination if only one page Closes #33609 See merge request gitlab-org/gitlab-ce!15999 | ||||
| | * | | | Do not show Vue pagination if only one page | Mario de la Ossa | 2017-12-21 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fix-webpack-chunk-naming | Clement Ho | 2017-12-21 | 90 | -1089/+1995 |
| |\ \ \ \ | |||||
| | * | | | | Resolve "Decouple multi-file editor from file list" | Tim Zallmann | 2017-12-21 | 68 | -936/+1768 |
| | | | | | | |||||
| * | | | | | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-naming | Mike Greiling | 2017-12-20 | 2 | -1/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Use non cached variables to get scroll position because of the performance bar | Filipa Lacerda | 2017-12-21 | 1 | -10/+14 |
| |/ / / |/| | | | |||||
* | | | | Restore missing language code in datetime_utility.js | Winnie Hellmann | 2017-12-21 | 1 | -5/+13 |
| | | | | |||||
* | | | | Merge branch '40063-markdown-editor-improvements' into 'master' | Filipa Lacerda | 2017-12-21 | 2 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994 | ||||
| * | | | | Add spec for previewing a note40063-markdown-editor-improvements | Annabel Dunstone Gray | 2017-12-20 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Hide & show toolbar on MR page | Annabel Dunstone Gray | 2017-12-18 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Hide toolbar in markdown preview mode | Annabel Dunstone Gray | 2017-12-18 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jivl-replace-d3-v3-v4' into 'master' | Mike Greiling | 2017-12-20 | 6 | -61/+105 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update d3 to v4 to enable tree shaking (and reduce the size of our webpack bundles) Closes #37013 See merge request gitlab-org/gitlab-ce!15585 | ||||
| * | | | | added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4 | Jose Ivan Vargas | 2017-12-18 | 2 | -7/+1 |
| | | | | | |||||
| * | | | | cleaned up date_time_formatters | Jose Ivan Vargas | 2017-12-18 | 1 | -17/+8 |
| | | | | | |||||
| * | | | | Restored the timeScaleFormat for the prometheus dashboard | Jose Ivan Vargas | 2017-12-18 | 2 | -6/+41 |
| | | | | | |||||
| * | | | | Refactored d3 modules to instead of having a common_d3 dir, to use the micro ↵ | Jose Ivan Vargas | 2017-12-18 | 7 | -121/+73 |
| | | | | | | | | | | | | | | | | | | | | modules instead | ||||
| * | | | | corrected functionality from the stat_contributors_graph | Jose Ivan Vargas | 2017-12-18 | 3 | -10/+25 |
| | | | | | |||||
| * | | | | fixed specs and the non-rendering stat_graph_contributors_graph | Jose Ivan Vargas | 2017-12-18 | 2 | -7/+6 |
| | | | | | |||||
| * | | | | optimized d3 v4 with a custom made bundle | Jose Ivan Vargas | 2017-12-18 | 6 | -6/+46 |
| | | | | | |||||
| * | | | | Modified contributors graph to use d3 v4 | Jose Ivan Vargas | 2017-12-18 | 2 | -24/+38 |
| | | | | | |||||
| * | | | | Update d3 to v4 and migrated the prometheus dashboard | Jose Ivan Vargas | 2017-12-18 | 3 | -43/+47 |
| |/ / / | |||||
* | | | | Merge branch 'master' into layout-nav-es-modulelayout-nav-es-module | Filipa Lacerda | 2017-12-20 | 11 | -41/+70 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 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 Remove block styling from search dropdown Fix sidebar height when performance bar enabled Remove all dropdown animations and set display: none if they're not open ... | ||||
| * \ \ \ | Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master' | Phil Hughes | 2017-12-20 | 1 | -16/+8 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Remove animations from dropdowns Closes #41186 See merge request gitlab-org/gitlab-ce!15968 | ||||
| | * | | | Remove transitionend event from GL dropdown | Phil Hughes | 2017-12-19 | 1 | -16/+8 |
| | |/ / | |||||
| * | | | Fix onion-skin re-entering state | Clement Ho | 2017-12-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Remove related links in MR widget when empty state | Clement Ho | 2017-12-19 | 4 | -14/+38 |
| | | | | |||||
| * | | | Show inline edit button for issues | Clement Ho | 2017-12-19 | 3 | -9/+2 |
| | | | | |||||
| * | | | Fix shortcut links on help page | Clement Ho | 2017-12-19 | 2 | -2/+21 |
| |/ / | |||||
* | | | Changed layout_nav to ES module | Phil Hughes | 2017-12-19 | 2 | -42/+33 |
|/ / | |||||
* | | Merge branch 'ph-es-notes-module' into 'master' | Filipa Lacerda | 2017-12-18 | 5 | -8/+14 |
|\ \ | | | | | | | | | | | | | Export and use Notes ES module See merge request gitlab-org/gitlab-ce!15953 | ||||
| * \ | Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-module | Phil Hughes | 2017-12-18 | 12 | -417/+435 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/main.js | ||||
| * | | | Export and use Notes ES module | Phil Hughes | 2017-12-15 | 5 | -8/+14 |
| | | | | |||||
* | | | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master' | Sean McGivern | 2017-12-18 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847 | ||||
| * | | | | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributes | Oswaldo Ferreira | 2017-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | requests | ||||
* | | | | | Translate date ranges on contributors page | Winnie Hellmann | 2017-12-18 | 1 | -8/+13 |
| | | | | | |||||
* | | | | | Move dateTickFormat to separate module | Winnie Hellmann | 2017-12-18 | 2 | -17/+42 |
| | | | | | |||||
* | | | | | Add right padding to contributors graph | Winnie Hellmann | 2017-12-18 | 1 | -1/+4 |
| | | | | |