summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '39497-inline-edit-issue-on-mobile' into 'master'Annabel Dunstone Gray2017-11-201-1/+1
|\ | | | | | | | | | | | | Add inline editing to issues on mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438
| * Add inline editing to issues on mobileEric Eastwood2017-11-181-1/+1
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-206-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * | Adds Rubocop rule for line break after guard clauseJacopo2017-11-166-0/+7
| | | | | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | | Merge branch 'improved-changes-dropdown' into 'master'Filipa Lacerda2017-11-171-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved the design of the changed files dropdown Closes #36687 See merge request gitlab-org/gitlab-ce!15367
| * | | updated to use new sprite iconsPhil Hughes2017-11-171-3/+3
| | | |
* | | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-171-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
| * | | Add request throttlesMichael Kozono2017-11-171-0/+9
| | | |
* | | | Merge branch 'rc/use-existing-url-helper' into 'master'Grzegorz Bizon2017-11-171-5/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Replace ci_status_path with pipeline_path See merge request gitlab-org/gitlab-ce!15369
| * | | Replace ci_status_path with pipeline_pathrc/use-existing-url-helperRémy Coutable2017-11-141-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'brand_header_change' into 'master'Annabel Dunstone Gray2017-11-161-0/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | When a custom header logo is present, don't show GitLab type logo See merge request gitlab-org/gitlab-ce!15410
| * | | When a custom header logo is present, don't show GitLab type logoDrew Blessing2017-11-151-0/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | In the new navigation header, when a user uploads a custom header logo GitLab will still show the 'GitLab' type logo. This is often undesirable as the user may want to upload a logo with their own name present. This change will toggle the GitLab type logo if a custom header logo is present.
* | | Truncate tree to max 1,000 items and display notice to usersDrew Blessing2017-11-151-3/+12
|/ / | | | | | | | | | | | | | | Rendering ten thousands of tree items consumes a lot of server time and can cause timeouts in extreme cases. Realistically, displaying more than 1,000 files is probably not useful so truncate and show the user a notice instead. 'Find files' can be used to locate specific files beyond the 1,000 limit.
* | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdownsBob Van Landuyt2017-11-141-2/+5
| | | | | | | | | | | | | | | | So the groups with the same parent are listed together. The recursive cte seemed to do it by itself, but it is not guaranteed. By ordering on the `route.path` that includes every parent group, we can assume they're going to be in the right order.
* | Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-141-1/+1
|/ | | | These dropdown options are used for creating and transfering projects.
* Fixed Function + Test based on MRTim Zallmann2017-11-091-3/+2
|
* Icon Sprite URL is also local even if asset_host is setTim Zallmann2017-11-091-1/+9
|
* Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-071-8/+18
|\ | | | | | | | | | | | | Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
| * Ensure enough space between branch linksMayra Cabrera2017-11-071-1/+1
| |
| * Add styles for branch & tags boxesMayra Cabrera2017-11-021-12/+0
| | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios
| * Add UI/UX improvementsMayra Cabrera2017-11-011-2/+14
| | | | | | | | | | - Leave 'too many tags to search' always visible - Add different message to the branch/tags so it states its unavailable
| * moved throttling into the controller. if we hit the throttlingBrett Walker2017-10-121-8/+18
| | | | | | | | threshhold, a message is shown indicating we didn't perform the search
* | Refactor issuables index actionsJarka Kadlecova2017-11-071-2/+0
| |
* | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-071-11/+0
|\ \ | | | | | | | | | | | | [CE backport] Saved configuration for issue board See merge request gitlab-org/gitlab-ce!15108
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-064-29/+42
| |\ \ | | | | | | | | | | | | 2518-saved-configuration-for-issue-board
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-012-15/+14
| |\ \ \ | | | | | | | | | | | | | | | 2518-saved-configuration-for-issue-board
| * | | | Remove unnecessary helper methodOswaldo Ferreira2017-10-311-6/+0
| | | | |
| * | | | Initial CE backport for saved issue boardOswaldo Ferreira2017-10-311-6/+1
| | | | |
| * | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-301-0/+11
| | | | | | | | | | | | | | | This reverts merge request !15009
* | | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-062-16/+14
| | | | |
* | | | | Resolve "Editor icons"Tim Zallmann2017-11-061-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-031-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some bugs related to forked projects of which the source was deleted. Closes #39667 See merge request gitlab-org/gitlab-ce!15150
| * | | | Make sure the settings page renders when root of a fork is deletedBob Van Landuyt2017-11-031-3/+11
| | |/ / | |/| |
* | | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-021-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567
| * | | | Fix the size of a status iconTim Zallmann2017-10-301-1/+1
| | | | |
| * | | | Updated Static Icons from CI AreaTim Zallmann2017-10-301-12/+12
| | |/ / | |/| |
| * | | [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-301-11/+0
| | | |
* | | | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-022-14/+19
| |/ / |/| |
* | | Load participants asyncEric Eastwood2017-10-311-10/+13
| | |
* | | Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlapEric Eastwood2017-10-311-5/+1
|/ / | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509
* | Added ssh fingerprint, gitlab ci and pages information in an instance ↵Francisco Lopez2017-10-251-0/+18
| | | | | | | | | | | | configuration page Closes #25142
* | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-242-3/+13
|\ \ | | | | | | | | | | | | | | | | | | Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
| * | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The circuitbreaker now has 2 failure modes: - Backing off: This will raise the `Gitlab::Git::Storage::Failing` exception. Access to the shard is blocked temporarily. - Circuit broken: This will raise the `Gitlab::Git::Storage::CircuitBroken` exception. Access to the shard will be blocked until the failures are reset.
| * | Allow configuring new circuitbreaker settings from the UI and APIBob Van Landuyt2017-10-231-0/+11
| | |
* | | 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
| | |
* | | Decrease Perceived Complexity threshold to 14Maxim Rydkin2017-10-201-8/+21
|/ /
* | Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-181-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924
| * | Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code.
* | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-181-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900
View Lorry Controller Status