summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Allow usage of any_projects? with an Arrayfix-any-projects-arrayYorick Peterse2017-08-151-0/+2
| | | | | | | In some cases we pass an Array to this method which would previously fail since Array does not respond to "limit_value". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
* Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'Rubén Dávila2017-08-142-2/+2
|\ | | | | | | | | Remove newlines in translations See merge request !13531
| * Remove `\n` from translationsbvl-use-no-wrap-for-pot-fileBob Van Landuyt2017-08-142-2/+2
| | | | | | | | | | They seem to confuse some translation tools and aren't rendered in HTML anyway.
* | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-0/+21
|/ | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
|
* Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-1/+1
| | | | | | | | This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
|
* Merge branch 'master' into ideMike Greiling2017-08-075-17/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * 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-072-0/+5
| |\ | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347
| | * Check if sidebar existscollapse-sidebar-bugsAnnabel Dunstone Gray2017-08-071-1/+1
| | |
| | * Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-072-0/+5
| | |
| * | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-072-16/+17
| |\ \ | | |/ | |/| | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| | * Support references to group milestonesSean McGivern2017-08-072-16/+17
| | | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
* | | Merge branch 'master' into ideMike Greiling2017-08-074-0/+81
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-071-0/+20
| |\ \ | | | | | | | | | | | | | | | | Improve various parts of Dashboard::ProjectsController See merge request !13319
| | * | Improve checking if projects would be returnedYorick Peterse2017-08-071-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-041-0/+37
| |/
| * Merge branch 'diff-changed-files-dropdown' into 'master'Filipa Lacerda2017-08-041-0/+18
| |\ | | | | | | | | | | | | | | | | | | Moved changed files into a dropdown Closes #29778 See merge request !13128
| | * Moved changed files into a dropdownPhil Hughes2017-08-031-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes navigating through diff files quickly. Currently we just toggle a list, which could be pretty big. This moves it into a dropdown to make it much easier. Also includes a filter bar to quickly search for certain files/extensions. Closes #29778
| * | Resolve "Specific Async Script Loading by using a Page Variable"Tim Zallmann2017-08-031-0/+6
| |/
* | Disable new repo on project showLuke "Jared" Bennett2017-08-041-1/+1
| |
* | More backend cleanupDouwe Maan2017-08-031-8/+0
| |
* | Clean up some backendDouwe Maan2017-08-031-3/+3
| |
* | Merge branch 'master' into ideDouwe Maan2017-08-034-8/+28
|\ \ | |/
| * Add filtered search to group issue dashboardClement Ho2017-08-021-4/+12
| |
| * Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-012-3/+3
| |
| * Fix group milestone path on issuable sidebarfix-group-milestone-link-in-issuable-sidebarSean McGivern2017-07-311-1/+13
| |
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-315-15/+36
|\ \ | |/
| * Moves the Performance Bar to the top instead of being at the bottomRémy Coutable2017-07-312-12/+27
| |
| * Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master'Douwe Maan2017-07-311-1/+3
| |\ | | | | | | | | | | | | | | | | | | Fix relative_url_root support for webpack chunks Closes #35567 See merge request !13165
| | * fix relative_url_root support for webpack chunksMike Greiling2017-07-281-1/+3
| | |
| * | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
| | * | Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
| * | | Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inlineSean McGivern2017-07-281-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When you change the diff view (inline / side-by-side), we set a cookie based on that new view. When you add a comment, we choose the style to use in the response based on that cookie. However, when you have just changed diff style, the request cookie will contain the old value, so we should use the view param instead.
* | | Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz2017-07-281-1/+1
|\ \ \
| * | | Fix repo break when no readmeLuke "Jared" Bennett2017-07-281-1/+1
| | | |
* | | | Updates dropdown to update branch in commit section.Jacob Schatz2017-07-281-1/+1
|/ / /
* | | Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz2017-07-2812-15/+168
|\ \ \
| * | | Add groundwork for feature flagLuke "Jared" Bennett2017-07-281-0/+4
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2811-15/+164
| |\ \ \ | | |/ /
| | * | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-282-0/+89
| | |\ \
| | | * \ Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-0/+85
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add all ApplicationSettings attributes to the API See merge request !12851
| | | | * | Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-0/+85
| | | | |/
| | | * | fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-0/+4
| | | | |
| | | * | nicer email badges on the profile gpg pageAlexis Reigel2017-07-271-11/+0
| | | | |
| | | * | convert gpg badge helper methods to partialsAlexis Reigel2017-07-271-86/+0
| | | | |
| | | * | add help links to gpg commits / gpg settingsAlexis Reigel2017-07-271-0/+7
| | | | |
| | | * | popover trigger needs to be defined in js initAlexis Reigel2017-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://github.com/twbs/bootstrap/issues/10547 it's not possible to have the trigger defined on the delegated element, i.e. not defined as a data attribute.
View Lorry Controller Status