summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Avoid wrapping users in dropdownwinh-user-dropdown-nowrapWinnie Hellmann2017-09-211-0/+8
|
* Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-211-0/+8
|\ | | | | | | | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
| * IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-211-0/+8
| |
* | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-214-12/+63
| |
* | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-211-6/+14
|\ \ | | | | | | | | | | | | | | | | | | Force two up view Closes #32613 See merge request gitlab-org/gitlab-ce!14397
| * | Force two up viewClement Ho2017-09-201-6/+14
| | |
* | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2135-534/+563
|\ \ \ | | | | | | | | | | | | | | | | Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
| * | | Exports all the methods in the same place37220-es-modulesFilipa Lacerda2017-09-181-25/+28
| | | |
| * | | Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-1826-252/+540
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ...
| * | | | Fix context for jquery eventFilipa Lacerda2017-09-151-7/+5
| | | | | | | | | | | | | | | | | | | | Remove unused function
| * | | | fixed todos specPhil Hughes2017-09-121-11/+6
| | | | |
| * | | | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-1212-41/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki_page_spec.rb Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog Docs group mrs list view search bar Replace the project/milestone.feature spinach test with an rspec analog Make all the tooltips in the same direction on the commit info box Reset all connection schema cache after migration tests Emoji was rendered as italic Adds Event polyfill for IE Add gitaly to patch update doc Document how to swap database tables. Replace 'project/wiki.feature' spinach test with an rspec analog Check for sidebar cookie instead of class when resizing window update installation and update instructions for 10.0 Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog Remove confidential toggle checkbox and related code as no longer necessary Bump grape_logging gem to 1.7.0 to get status codes for error messages Expand filtered parameters to include `token` Replace the project/team_management.feature spinach test with an rspec analog Replace the profile/emails.feature spinach test with an rspec analog Replace project/group_links.feature spinach test with an rspec analog ...
| * | | | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-0926-85/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes set favicon related methods from global scope Improves test related with favicon Removes convertPermissionToBoolean from global scope. Adds tests for convertPermissionToBoolean - were non existant Removes setParamInURL from gl.utils Removes parseIntPagination from gl.utils namespace Remove normalizeCRLFHeaders from gl.utils namespace Removes normalizeHeaders from gl.utils namespace Use gl.utils for filtered search Fix bad import Fix broken test by cleaning window.history namespace Adds changelog
| * | | | | Use modules in common utilsFilipa Lacerda2017-09-0913-460/+472
| | | | | |
* | | | | | Merge branch 'resolve-discussions-btn' into 'master'Phil Hughes2017-09-211-14/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make resolve discussion icon gray See merge request gitlab-org/gitlab-ce!14398
| * | | | | | Make resolve discussion icon grayresolve-discussions-btnAnnabel Dunstone Gray2017-09-201-14/+6
| | | | | | |
* | | | | | | Merge branch 'fix-image-diff-swipe-handle' into 'master'Annabel Dunstone Gray2017-09-201-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image diff swipe handle offset to correctly align with the frame Closes #37928 See merge request gitlab-org/gitlab-ce!14392
| * | | | | | Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handleClement Ho2017-09-201-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '37862-breadcrumbs-mobile' into 'master'Tim Zallmann2017-09-202-5/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mobile sidebar button to match height of desktop breadcrumbs Closes #37862 See merge request gitlab-org/gitlab-ce!14282
| * | | | | | Vertically center hamburger button37862-breadcrumbs-mobileAnnabel Dunstone Gray2017-09-182-7/+3
| | | | | | |
| * | | | | | Increase tap target on hamburger menuAnnabel Dunstone Gray2017-09-152-3/+8
| | | | | | |
| * | | | | | Fix mobile sidebar button to match height of desktop breadcrumbsAnnabel Dunstone Gray2017-09-141-0/+6
| | | | | | |
* | | | | | | Merge branch '36884-gitaly-admin-version' into 'master'Tim Zallmann2017-09-201-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly version to Admin Dashboard Closes #36884 See merge request gitlab-org/gitlab-ce!14313
| * | | | | | Add Gitaly version to Admin DashboardJacopo2017-09-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays the Gitaly version in the admin dashboard.
* | | | | | | Merge branch ↵Fatih Acet2017-09-193-73/+56
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37298-the-prettytime-utils-module-could-use-some-light-maintenance' into 'master' Resolve some tech debt in the prettyTime module Closes #37298 See merge request gitlab-org/gitlab-ce!14058
| * | | | | | | Lightly refactor prettyTime module.37298-the-prettytime-utils-module-could-use-some-light-maintenanceBryce Johnson2017-09-143-73/+56
| | | | | | | |
* | | | | | | | Merge branch 'revert-feature-highlight' into 'master'Jacob Schatz2017-09-197-236/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert feature highlight Closes #38087 See merge request gitlab-org/gitlab-ce!14373
| * | | | | | | | Revert feature highlightClement Ho2017-09-197-236/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Only show the sidebar scroll bars if the user can scrollsidebar-sidebars-only-when-scrollPhil Hughes2017-09-192-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37972
* | | | | | | | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-196-8/+7
| | | | | | | |
* | | | | | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-191-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo editor UI fixes part 2 Closes #37830, #36247, #37829, and #36244 See merge request gitlab-org/gitlab-ce!14261
| * | | | | | | | RepoEditor: Add hover color for the close icon.repo-editor-ui-fixFatih Acet2017-09-141-0/+4
| | | | | | | | |
| * | | | | | | | RepoEditor: Fix height of the file list.Fatih Acet2017-09-141-1/+0
| | | | | | | | |
| * | | | | | | | RepoEditor: Improve tab spacing and styling.Fatih Acet2017-09-141-3/+2
| | | | | | | | |
* | | | | | | | | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-184-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* | | | | | | | | Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-183-3/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
| * | | | | | | | | Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-133-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
* | | | | | | | | | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-181-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
| * | | | | | | | | Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-iconEric Eastwood2017-09-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465 Related MRs - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042
* | | | | | | | | | Merge branch '37590-pipelines-mr' into 'master'Annabel Dunstone Gray2017-09-181-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
| * | | | | | | | | | Fix mini graph pipeline breakin in merge request view37590-pipelines-mrFilipa Lacerda2017-09-151-0/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-missing-javascript-imports' into 'master'Tim Zallmann2017-09-183-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing import statements See merge request gitlab-org/gitlab-ce!14209
| * | | | | | | | | | Add missing import statementswinh-missing-javascript-importswinh2017-09-183-0/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'role-badge-fix' into 'master'Douwe Maan2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Fix role badge styling. See merge request gitlab-org/gitlab-ce!14279
| * | | | | | | | | | IssueNotes: Fix role badge styling.role-badge-fixFatih Acet2017-09-141-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Remove gaps under nav on build pageAnnabel Dunstone Gray2017-09-182-7/+7
| | | | | | | | | | |
* | | | | | | | | | | Fixed the new sidebars width when browser has scrollbarsPhil Hughes2017-09-162-8/+10
| | | | | | | | | | |
* | | | | | | | | | | Display whether branch has been merged when deleting protected branchWinnie Hellmann2017-09-151-2/+6
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-151-5/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
| * | | | | | | | | Remove title attribute from sidebar elementsPhil Hughes2017-09-131-5/+0
| | |_|_|/ / / / / | |/| | | | | | |
View Lorry Controller Status