summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
Commit message (Collapse)AuthorAgeFilesLines
* Stop sections from expanding when scrolling over the 1px section35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-stateEric Eastwood2017-10-311-0/+4
| | | | See https://gitlab.slack.com/archives/C0GQHHPGW/p1508253662000271
* remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-311-5/+4
|
* Load participants asyncEric Eastwood2017-10-311-2/+4
|
* Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-301-0/+13
| | | This reverts merge request !15009
* Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-301-11/+1
|\ | | | | | | | | | | | | Enable NestingDepth (level 6) on scss-lint Closes #39582 See merge request gitlab-org/gitlab-ce!15073
| * Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-301-11/+1
| |
* | [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-301-13/+0
|/
* Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-241-1/+1
|\ | | | | | | | | | | | | Add new files & directories in the multi-file editor Closes #38614 See merge request gitlab-org/gitlab-ce!14839
| * moved to eventHub to manage creating new filesPhil Hughes2017-10-231-1/+1
| | | | | | | | removed an ID from the CSS
* | Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-241-1/+1
|\ \ | | | | | | | | | | | | Clean up `new-sidebar` See merge request gitlab-org/gitlab-ce!14978
| * | Replace all instances of new-sidebar with contextual-sidebarAnnabel Dunstone Gray2017-10-201-1/+1
| | |
* | | Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix code review discussion action buttons Closes #38891 See merge request gitlab-org/gitlab-ce!14801
| * | Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-colorAnnabel Dunstone Gray2017-10-232-2/+5
| | |
* | | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-231-5/+0
| |/ |/| | | | | | | | | Encompasses designs from - https://gitlab.com/gitlab-org/gitlab-ce/issues/23206#note_43355199 - https://gitlab.com/gitlab-org/gitlab-ce/issues/29985#note_30417407
* | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-171-55/+27
|\ \ | | | | | | | | | | | | Refactored multi-file data structure See merge request gitlab-org/gitlab-ce!14862
| * | Refactored multi-file data structurePhil Hughes2017-10-161-55/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves away from storing in a single array just to render the table. It now stores in a multi-dimensional array/object type where each entry in the array can have its own tree. This makes storing the data for future feature a little easier as there is only one way to store the data. Previously to insert a directory the code had to insert the directory & then the file at the right point in the array. Now the directory can be inserted anywhere & then a file can be quickly added into this directory. The rendering is still done with a single array, but this is handled through underscore. Underscore takes the array & then goes through each item to flatten it into one. It is done this way to save changing the markup away from table, keeping it as a table keeps it semantically correct.
* | | Add inline edit button to issue_show appClement Ho2017-10-172-2/+12
| | |
* | | Adds collapsible sections in cluster pageFilipa Lacerda2017-10-171-1/+1
| | |
* | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-171-6/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * \ \ Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1014-60/+280
| |\ \ \
| * | | | Groups tree enhancements for Groups Dashboard and Group HomepageKushal Pandya2017-10-041-6/+109
| | | | |
* | | | | Remove extra border radius when editing a fileRachel Pipkin2017-10-161-1/+1
| |_|/ / |/| | |
* | | | Move retry button to sidebarFilipa Lacerda2017-10-161-2/+2
| | | |
* | | | Merge branch 'fix-cursor-path' into 'master'Tim Zallmann2017-10-131-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Use image-url instead of url so that asset pipeline can do it's thing Closes #38980 See merge request gitlab-org/gitlab-ce!14799
| * | | Use image-url instead of url so that asset pipeline can do it's thingfix-cursor-pathClement Ho2017-10-101-2/+2
| | |/ | |/|
* | | Add project fields to import project by urlAnnabel Dunstone Gray2017-10-111-1/+5
| | |
* | | Simplify project pageAnnabel Dunstone Gray2017-10-112-52/+92
|/ /
* | Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-092-4/+9
| |
* | Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-075-10/+10
|\ \ | | | | | | | | | | | | Remove old navigation CSS See merge request gitlab-org/gitlab-ce!14573
| * | Start moving new nav styles into header.scssAnnabel Dunstone Gray2017-10-063-9/+9
| | |
| * | FixesAnnabel Dunstone Gray2017-10-061-0/+1
| | |
| * | Remove nav images; remove old nav styles; create new file for other ↵Annabel Dunstone Gray2017-10-061-1/+0
| | | | | | | | | | | | navigation elements
* | | Commenting on image diffsFelipe Artur2017-10-073-22/+170
|/ /
* | Merge branch ↵Kamil Trzciński2017-10-061-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| * \ Merge branch 'master' into ↵Shinya Maeda2017-10-072-2/+17
| |\ \ | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-061-0/+8
| |\ \ \ | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | Fix margins in edit formFilipa Lacerda2017-10-061-0/+4
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-10-052-5/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-053-58/+53
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-041-0/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-0412-97/+85
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | | | | Adds new line for cssFilipa Lacerda2017-10-031-1/+1
| | | | | | | | |
| * | | | | | | | Starts edit formFilipa Lacerda2017-10-021-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-063-17/+49
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| * | | | | | | | UX review18608-lock-issues-v2Luke "Jared" Bennett2017-10-062-0/+8
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jarka Kadlecova2017-10-0312-97/+85
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| * | | | | | | | Correct disabled note form style18608-lock-issuesLuke "Jared" Bennett2017-09-271-0/+16
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-251-14/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-205-5/+23
| |\ \ \ \ \ \ \ \
View Lorry Controller Status