summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-094-27/+4
| | | | | Remove repo editor feature flag from RC1 See merge request !13379
* Fix bar chart does not display label at hour 0Jason Dai2017-08-081-3/+3
|
* Merge branch 'master' into ideMike Greiling2017-08-0720-205/+274
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * Show all labelsRegis Boudinot2017-08-081-2/+10
| |
| * 33874 confidential issue redesignRegis Boudinot2017-08-073-6/+13
| |
| * Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-071-1/+2
| |
| * Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-074-5/+5
| |\ | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347
| | * Add class to other sidebarsAnnabel Dunstone Gray2017-08-073-3/+3
| | |
| | * Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-071-2/+2
| | |
| * | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-071-3/+4
| | |
| * | Improve mobile sidebarAnnabel Dunstone Gray2017-08-075-12/+4
| | |
| * | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-072-99/+100
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| | * | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-041-84/+85
| | | |
| | * | remove nicescroll from wiki sidebarMike Greiling2017-08-041-15/+16
| | | |
| | * | remove niceScroll from job trigger variables listMike Greiling2017-08-041-5/+4
| | | |
| * | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-077-77/+136
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| | * | Fix html structureFilipa Lacerda2017-08-071-3/+2
| | | | | | | | | | | | | | | | Removes test for removed behavior
| | * | Port form back to use form_tagZ.J. van de Weg2017-08-071-15/+9
| | | |
| | * | Fix HAML lint errorszj-project-templatesZ.J. van de Weg2017-08-071-4/+3
| | | |
| | * | After merge cleanupZ.J. van de Weg2017-08-071-1/+1
| | | |
| | * | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-07145-892/+879
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| | * | | Fix repo by url stylesFilipa Lacerda2017-08-032-14/+14
| | | | |
| | * | | Style or separator according to reviewFilipa Lacerda2017-08-032-4/+4
| | | | |
| | * | | Adds export form and enables export button by defaultFilipa Lacerda2017-08-012-36/+44
| | | | |
| | * | | Style OR separator properlyFilipa Lacerda2017-08-011-1/+1
| | | | |
| | * | | [ci skip] Adds svgs and css for all iconsFilipa Lacerda2017-08-015-6/+33
| | | | |
| | * | | [ci skip] Removes dummy placeholdersFilipa Lacerda2017-07-311-11/+0
| | | | |
| | * | | Adds CSS for desktop and mobileFilipa Lacerda2017-07-312-8/+18
| | | | |
| | * | | [ci skip] Adds hr between form fieldsFilipa Lacerda2017-07-301-3/+3
| | | | |
| | * | | Styles html according to mockupFilipa Lacerda2017-07-302-56/+69
| | | | |
| | * | | Allow projects to be started from a templateZ.J. van de Weg2017-07-282-26/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
* | | | | fix inline javascript causing old-style repo view to breakMike Greiling2017-08-071-6/+0
| | | | |
* | | | | Merge branch 'master' into ideMike Greiling2017-08-0735-306/+341
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * | | | Merge branch '34028-collapse-sidebar' into 'master'Phil Hughes2017-08-075-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Navigation - Make contextual sidebar collapsible" Closes #34028 See merge request !13281
| | * | | | Make contextual sidebar collapsibleAnnabel Dunstone Gray2017-08-075-0/+12
| | | |/ / | | |/| |
| * | | | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-071-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature rename wiki title Closes #27800 See merge request !10069
| | * | | | Allow wiki pages to be renamed in the UIwendy04022017-08-031-1/+4
| | | | | |
| * | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-074-6/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve various parts of Dashboard::ProjectsController See merge request !13319
| | * | | | | Improve checking if projects would be returnedYorick Peterse2017-08-074-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In various places we check if the same relation would return projects. This is done using "any?" which will run a COUNT query with any LIMIT/OFFSET values still applied. To work around all this we introduce 2 helper methods that take care of doing the right thing. This leads to the produced queries being simpler and fewer queries being executed.
| * | | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-072-13/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
| | * \ \ \ \ \ Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-0717-238/+243
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| | * | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-042-13/+29
| | | | | | | |
| * | | | | | | Merge branch '34764-rename-to-overview' into 'master'Annabel Dunstone Gray2017-08-074-7/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34764 Rename about to overview for group and project page Closes #34764 See merge request !13318
| | * | | | | | | 34764 Rename about to overview for group and project page34764-rename-to-overviewtauriedavis2017-08-044-7/+7
| | |/ / / / / /
| * | | | | | | Merge branch 'remove-tree-holder' into 'master'Phil Hughes2017-08-073-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused #tree-holder Closes #36035 See merge request !13338
| | * | | | | | | Remove unused #tree-holderremove-tree-holderClement Ho2017-08-073-3/+3
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-35786' into 'master'Rémy Coutable2017-08-071-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing whitespace in "private forks you have no access to" Closes #35786 See merge request !13332
| | * | | | | | Add a missing whitespace in "private forks you have no access to"Mehdi Lahmam2017-08-061-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Fix #35786
| * | | | | | Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-071-1/+1
| |/ / / / /
| * | | | | Merge branch 'ci-lint-fix' into 'master'Tim Zallmann2017-08-062-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order of CI lint ace editor loading Closes #35985 See merge request !13316
View Lorry Controller Status