Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Truncate tree to max 1,000 items and display notice to users | Drew Blessing | 2017-11-15 | 1 | -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-dropdowns | Bob Van Landuyt | 2017-11-14 | 1 | -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 dropdowns | Bob Van Landuyt | 2017-11-14 | 1 | -1/+1 |
| | | | | These dropdown options are used for creating and transfering projects. | ||||
* | Fixed Function + Test based on MR | Tim Zallmann | 2017-11-09 | 1 | -3/+2 |
| | |||||
* | Icon Sprite URL is also local even if asset_host is set | Tim Zallmann | 2017-11-09 | 1 | -1/+9 |
| | |||||
* | Merge branch '37824-many-branches-lock-server' into 'master' | Annabel Dunstone Gray | 2017-11-07 | 1 | -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 links | Mayra Cabrera | 2017-11-07 | 1 | -1/+1 |
| | | |||||
| * | Add styles for branch & tags boxes | Mayra Cabrera | 2017-11-02 | 1 | -12/+0 |
| | | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios | ||||
| * | Add UI/UX improvements | Mayra Cabrera | 2017-11-01 | 1 | -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 throttling | Brett Walker | 2017-10-12 | 1 | -8/+18 |
| | | | | | | | | threshhold, a message is shown indicating we didn't perform the search | ||||
* | | Refactor issuables index actions | Jarka Kadlecova | 2017-11-07 | 1 | -2/+0 |
| | | |||||
* | | Merge branch '2518-saved-configuration-for-issue-board' into 'master' | Sean McGivern | 2017-11-07 | 1 | -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 Knox | 2017-11-06 | 4 | -29/+42 |
| |\ \ | | | | | | | | | | | | | 2518-saved-configuration-for-issue-board | ||||
| * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-01 | 2 | -15/+14 |
| |\ \ \ | | | | | | | | | | | | | | | | 2518-saved-configuration-for-issue-board | ||||
| * | | | | Remove unnecessary helper method | Oswaldo Ferreira | 2017-10-31 | 1 | -6/+0 |
| | | | | | |||||
| * | | | | Initial CE backport for saved issue board | Oswaldo Ferreira | 2017-10-31 | 1 | -6/+1 |
| | | | | | |||||
| * | | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818f | Dmitriy Zaporozhets | 2017-10-30 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | This reverts merge request !15009 | ||||
* | | | | | Resolve "DashboardController#activity.json is slow due to SQL" | Francisco Javier López | 2017-11-06 | 2 | -16/+14 |
| | | | | | |||||
* | | | | | Resolve "Editor icons" | Tim Zallmann | 2017-11-06 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'bvl-unlink-fixes' into 'master' | Douwe Maan | 2017-11-03 | 1 | -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 deleted | Bob Van Landuyt | 2017-11-03 | 1 | -3/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'icons-ci-icons' into 'master' | Filipa Lacerda | 2017-11-02 | 1 | -12/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567 | ||||
| * | | | | Fix the size of a status icon | Tim Zallmann | 2017-10-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updated Static Icons from CI Area | Tim Zallmann | 2017-10-30 | 1 | -12/+12 |
| | |/ / | |/| | | |||||
| * | | | [CE backport] Saved configuration for issue board | Oswaldo Ferreira | 2017-10-30 | 1 | -11/+0 |
| | | | | |||||
* | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 2 | -14/+19 |
| |/ / |/| | | |||||
* | | | Load participants async | Eric Eastwood | 2017-10-31 | 1 | -10/+13 |
| | | | |||||
* | | | Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlap | Eric Eastwood | 2017-10-31 | 1 | -5/+1 |
|/ / | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509 | ||||
* | | Added ssh fingerprint, gitlab ci and pages information in an instance ↵ | Francisco Lopez | 2017-10-25 | 1 | -0/+18 |
| | | | | | | | | | | | | configuration page Closes #25142 | ||||
* | | Merge branch 'bvl-circuitbreaker-backoff' into 'master' | Sean McGivern | 2017-10-24 | 2 | -3/+13 |
|\ \ | | | | | | | | | | | | | | | | | | | Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933 | ||||
| * | | Implement backoff for the circuitbreaker | Bob Van Landuyt | 2017-10-23 | 1 | -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 API | Bob Van Landuyt | 2017-10-23 | 1 | -0/+11 |
| | | | |||||
* | | | Merge branch 'remove-new-sidebar-stuff' into 'master' | Phil Hughes | 2017-10-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | Clean up `new-sidebar` See merge request gitlab-org/gitlab-ce!14978 | ||||
| * | | Replace all instances of new-sidebar with contextual-sidebar | Annabel Dunstone Gray | 2017-10-20 | 1 | -1/+1 |
| | | | |||||
* | | | Decrease Perceived Complexity threshold to 14 | Maxim Rydkin | 2017-10-20 | 1 | -8/+21 |
|/ / | |||||
* | | Merge branch 'bvl-fix-locale-path' into 'master' | Tim Zallmann | 2017-10-18 | 1 | -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 Landuyt | 2017-10-18 | 1 | -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 Maan | 2017-10-18 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900 | ||||
| * | | Add readme only option as project view | Annabel Dunstone Gray | 2017-10-16 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master' | Douwe Maan | 2017-10-17 | 1 | -0/+32 |
|\ \ \ | | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842 | ||||
| * | | | Allow configuring the circuitbreaker through the API and UI | Bob Van Landuyt | 2017-10-17 | 1 | -0/+32 |
| |/ / | |||||
* | | | Merge branch 'bvl-group-trees' into 'master' | Douwe Maan | 2017-10-17 | 1 | -0/+11 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055 | ||||
| * | | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 8 | -6/+31 |
| |\ \ | | |/ | |||||
| * | | Groups tree enhancements for Groups Dashboard and Group Homepage | Kushal Pandya | 2017-10-04 | 1 | -0/+11 |
| | | | |||||
* | | | Cache issuable template names | Sean McGivern | 2017-10-12 | 1 | -10/+2 |
| |/ |/| | | | | | | | | | | | We were looking these up on each request to an issue page, because the form is pre-filled, as is the template dropdown. That was unnecessary: we could just treat these as 'special' repository files (like the rendered README) and cache them in Redis until they change on a push. | ||||
* | | Stop using `branch_names.include?` and use `branch_exists?` | Andrew Newdigate | 2017-10-10 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' | Douwe Maan | 2017-10-10 | 2 | -2/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443 | ||||
| * | | Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatible | Tim Zallmann | 2017-10-10 | 1 | -5/+1 |
| | | | |||||
| * | | Fix for Lint Error + Upload Test | Tim Zallmann | 2017-10-09 | 1 | -1/+0 |
| | | | |||||
| * | | Based on MR simplified the logic | Tim Zallmann | 2017-10-09 | 2 | -15/+3 |
| | | |