summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup diff-notes-collapse csscleanup-cssClement Ho2017-09-261-6/+1
|
* Make issue boards sidebar full heightWinnie Hellmann2017-09-264-20/+17
|
* Merge branch 'mobile-breadcrumbs-divider' into 'master'Annabel Dunstone Gray2017-09-262-5/+7
|\ | | | | | | | | Fix sidebar mobile toggle button border See merge request gitlab-org/gitlab-ce!14502
| * Fix sidebar mobile toggle button bordermobile-breadcrumbs-dividerPhil Hughes2017-09-262-5/+7
| |
* | Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-263-16/+32
|\ \ | | | | | | | | | | | | Dynamically create offset for sticky bar See merge request gitlab-org/gitlab-ce!14280
| * | refactor tests to actually test browser behaviourPhil Hughes2017-09-251-1/+1
| | |
| * | removed commented out CSSPhil Hughes2017-09-252-6/+1
| | |
| * | spec fixesPhil Hughes2017-09-221-0/+6
| | |
| * | Dynamically create offset for sticky barPhil Hughes2017-09-222-12/+27
| | |
* | | Moves cycle analytics components into vue filesFilipa Lacerda2017-09-2618-432/+399
| |/ |/|
* | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-268-141/+83
|\ \ | | | | | | | | | | | | Remove old nav code - Part 1 See merge request gitlab-org/gitlab-ce!14379
| * | Fix UI bugsremove-old-nav-stylesAnnabel Dunstone Gray2017-09-253-12/+15
| | |
| * | Remove all old sub nav barsAnnabel Dunstone Gray2017-09-252-6/+4
| | |
| * | Combine all search releated CSSAnnabel Dunstone Gray2017-09-252-110/+47
| | |
| * | Remove unused admin subnavsAnnabel Dunstone Gray2017-09-252-34/+36
| | |
| * | Move new nav into main CSS folderAnnabel Dunstone Gray2017-09-253-0/+2
| | |
* | | Merge branch 'winh-user-dropdown-nowrap' into 'master'Phil Hughes2017-09-261-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid wrapping users in dropdown Closes #38077 See merge request gitlab-org/gitlab-ce!14410
| * | | Avoid wrapping users in dropdownwinh-user-dropdown-nowrapWinnie Hellmann2017-09-211-0/+8
| | | |
* | | | Merge branch '31094-define-color-priorities' into 'master'Annabel Dunstone Gray2017-09-2612-58/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update color variables See merge request gitlab-org/gitlab-ce!14456
| * | | | Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-prioritiesPedro Moreira da Silva2017-09-2312-58/+58
| | | | |
* | | | | Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'Jacob Schatz2017-09-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepoEditor: Fix reopening the existing file on refresh. Closes #38250 See merge request gitlab-org/gitlab-ce!14449
| * | | | | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-fileFatih Acet2017-09-221-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'docs/chmod-644' into 'master'Rémy Coutable2017-09-251-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove execution permission (unix file permissions) for documentation Closes #38287 See merge request gitlab-org/gitlab-ce!14471
| * | | | Check for exec permissions also in app/docs/chmod-644Achilleas Pipinellis2017-09-251-0/+0
| | | | |
* | | | | Removes cycle analytics service and store from global namespaceFilipa Lacerda2017-09-253-59/+49
| | | | |
* | | | | Merge branch 'fly-out-nav-mousepos-error' into 'master'Filipa Lacerda2017-09-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338
| * | | | | spec fixesfly-out-nav-mousepos-errorPhil Hughes2017-09-221-1/+1
| | | | | |
| * | | | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Remove navbar gradient37287-remove-nav-gradientAnnabel Dunstone Gray2017-09-221-2/+2
| |_|_|/ |/| | |
* | | | Removed old icons from project pagePhil Hughes2017-09-222-7/+2
|/ / /
* | | Merge branch '32782-i18n-support-pagination' into 'master'Tim Zallmann2017-09-221-4/+6
|\ \ \ | | | | | | | | | | | | | | | | Add i18n support to pagination widget See merge request gitlab-org/gitlab-ce!14407
| * | | Add i18n support for pagination testkushalpandya2017-09-211-4/+6
| | | |
* | | | Merge branch 'emoji-dom-size' into 'master'Fatih Acet2017-09-222-6/+43
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Improve emoji menu rendering performance Closes #36949 See merge request gitlab-org/gitlab-ce!14233
| * | | Remove eslint-disable, and use arrow function.emoji-dom-sizeBryce Johnson2017-09-201-3/+2
| | | |
| * | | Reverse order in showMenuElement for readability.Bryce Johnson2017-09-201-2/+2
| | | |
| * | | Move display:none to emoji-menu base class.Bryce Johnson2017-09-201-4/+1
| | | |
| * | | Remove emoji-menu from the render tree when hidden.Bryce Johnson2017-09-192-6/+47
| | | |
* | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-2232-80/+3425
| | | |
* | | | Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-223-9/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429
| * | | | Fix rendering double note issue.Fatih Acet2017-09-223-9/+26
| | |_|/ | |/| |
* | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
|/ / /
* | | 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