| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '4056-hashed-storage-upload-transfers' into 'master' | Stan Hu | 2017-11-17 | 1 | -1/+11 |
| |\ | | | | | | | | | | | | | Fix project transfer with hashed-storage attachments Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15457 | ||||
| | * | Fix project transfer with hashed-storage attachments | Nick Thomas | 2017-11-17 | 1 | -1/+11 |
| | | | |||||
| * | | Merge branch 'improved-changes-dropdown' into 'master' | Filipa Lacerda | 2017-11-17 | 5 | -11/+41 |
| |\ \ | | | | | | | | | | | | | | | | | | | Improved the design of the changed files dropdown Closes #36687 See merge request gitlab-org/gitlab-ce!15367 | ||||
| | * | | moved magic number into variablesimproved-changes-dropdown | Phil Hughes | 2017-11-17 | 1 | -1/+2 |
| | | | | |||||
| | * | | changed text color of path | Phil Hughes | 2017-11-17 | 1 | -0/+1 |
| | | | | |||||
| | * | | updated dropdown width | Phil Hughes | 2017-11-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | updated to use new sprite icons | Phil Hughes | 2017-11-17 | 3 | -4/+6 |
| | | | | |||||
| | * | | Improved the design of the changed files dropdown | Phil Hughes | 2017-11-17 | 3 | -8/+34 |
| | |/ | | | | | | | Closes #36687 | ||||
| * | | Merge branch 'mk-add-user-rate-limits' into 'master' | Douwe Maan | 2017-11-17 | 4 | -22/+74 |
| |\ \ | |/ |/| | | | | | | | | | Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708 | ||||
| | * | Moved Exceptions to Gitlab::Auth | Francisco Lopez | 2017-11-17 | 1 | -2/+4 |
| | | | |||||
| | * | Applied some code review comments | Francisco Lopez | 2017-11-17 | 1 | -2/+1 |
| | | | |||||
| | * | Some fixes after rebase | Francisco Lopez | 2017-11-17 | 1 | -24/+0 |
| | | | |||||
| | * | Fix OAuth API and RSS rate limiting | Michael Kozono | 2017-11-17 | 1 | -1/+1 |
| | | | |||||
| | * | Add request throttles | Michael Kozono | 2017-11-17 | 3 | -2/+70 |
| | | | |||||
| | * | Add throttle application settings | Michael Kozono | 2017-11-17 | 1 | -0/+9 |
| | | | |||||
| * | | Changing OAuth lookup to be case insensitive | Francisco Javier López | 2017-11-17 | 3 | -7/+17 |
| | | | |||||
| * | | Merge branch 'sh-port-hashed-storage-transfer-fix' into 'master' | Nick Thomas | 2017-11-17 | 1 | -9/+17 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix hashed storage with project transfers to another namespace Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15444 | ||||
| | * | | Fix hashed storage with project transfers to another namespacesh-port-hashed-storage-transfer-fix | Stan Hu | 2017-11-16 | 1 | -9/+17 |
| | |/ | | | | | | | | | | | | | | | With hashed storage enabled, we would fail to transfer a project to another namespace because the provided paths were wrong. Instead, we should not attempt to move paths at all. Closes gitlab-org/gitlab-ee#4056 | ||||
| * | | Merge branch 'bvl-delete-empty-fork-networks' into 'master' | Douwe Maan | 2017-11-17 | 1 | -0/+10 |
| |\ \ | | | | | | | | | | | | | Delete empty fork networks See merge request gitlab-org/gitlab-ce!15373 | ||||
| | * | | Delete the fork network when removing the last membership | Bob Van Landuyt | 2017-11-17 | 1 | -0/+10 |
| | |/ | |||||
| * | | Merge branch 'ci-pipeline-status-query' into 'master' | Kamil Trzciński | 2017-11-17 | 7 | -26/+117 |
| |\ \ | | | | | | | | | | | | | Optimise getting the pipeline status of commits See merge request gitlab-org/gitlab-ce!15332 | ||||
| | * | | Optimise getting the pipeline status of commitsci-pipeline-status-query | Yorick Peterse | 2017-11-16 | 7 | -26/+117 |
| | | | | | | | | | | | | | | | | This adds an optimised way of getting the latest pipeline status for a list of Commit objects (or just a single one). | ||||
| * | | | Resolve "Performance issues when loading large number of wiki pages" | Francisco Javier López | 2017-11-17 | 6 | -15/+25 |
| | | | | |||||
| * | | | Exports a couple of project related code as es6 modules | Filipa Lacerda | 2017-11-17 | 8 | -311/+272 |
| | | | | |||||
| * | | | Merge branch 'rc/use-existing-url-helper' into 'master' | Grzegorz Bizon | 2017-11-17 | 2 | -6/+1 |
| |\ \ \ | |_|/ |/| | | | | | | | | 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-helper | Rémy Coutable | 2017-11-14 | 2 | -6/+1 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Resolve "lock/confidential issuable sidebar custom svg icons iteration" | Luke "Jared" Bennett | 2017-11-16 | 8 | -57/+93 |
| | | | | |||||
| * | | | Merge branch 'cache-user-keys-count' into 'master' | Douwe Maan | 2017-11-16 | 8 | -28/+81 |
| |\ \ \ | | | | | | | | | | | | | | | | | Cache the number of user SSH keys See merge request gitlab-org/gitlab-ce!15401 | ||||
| | * | | | Cache the number of user SSH keyscache-user-keys-count | Yorick Peterse | 2017-11-16 | 8 | -28/+81 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | By caching the number of personal SSH keys we reduce the number of queries necessary on pages such as ProjectsController#show (which can end up querying this data multiple times). The cache is refreshed/flushed whenever an SSH key is added, removed, or when a user is removed. | ||||
| * | | | Merge branch 'brand_header_change' into 'master' | Annabel Dunstone Gray | 2017-11-16 | 3 | -2/+9 |
| |\ \ \ | | | | | | | | | | | | | | | | | 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 logo | Drew Blessing | 2017-11-15 | 3 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge branch 'dm-notes-actions-noteable-for-update' into 'master' | Sean McGivern | 2017-11-16 | 2 | -3/+8 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure NotesActions#noteable returns a Noteable in the update action Closes #40208 See merge request gitlab-org/gitlab-ce!15421 | ||||
| | * | | | | Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-update | Douwe Maan | 2017-11-16 | 2 | -3/+8 |
| | |/ / / | |||||
| * | | | | Merge branch 'backport-delete-epic' into 'master' | Filipa Lacerda | 2017-11-16 | 5 | -6/+40 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport delete epic changes Closes #40162 See merge request gitlab-org/gitlab-ce!15414 | ||||
| | * | | | | Backport delete epic changesbackport-delete-epic | Clement Ho | 2017-11-15 | 5 | -6/+40 |
| | | | | | | |||||
| * | | | | | Resolve "Clicking on GPG verification badge jumps to top of the page" | Mike Greiling | 2017-11-16 | 2 | -2/+2 |
| |/ / / / | |||||
| * | | | | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master' | Filipa Lacerda | 2017-11-15 | 8 | -1031/+1058 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390 | ||||
| | * | | | | Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojione | Eric Eastwood | 2017-11-15 | 2 | -2/+0 |
| | | | | | | |||||
| | * | | | | Add rainbow_flag to emoji support map | Eric Eastwood | 2017-11-15 | 2 | -6/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on the following platforms that split the emoji into separate characters currently. - Windows 10 FCU - Chrome 62.0.3202.89 - Firefox 57.0b14 - MS Edge 41.16299.15.0 - macOS 10.12.6 - Chrome 63.0.3239.40 - Safari 11.0.1 (12604.3.5.1.1) - Firefox 57.0 - Ubuntu 16.04 - Chromium 62.0.3202.75 - Firefox 56.0 | ||||
| | * | | | | Regenerate emoji digests with latest gemojione | Eric Eastwood | 2017-11-14 | 8 | -1025/+1029 |
| | | | | | | |||||
| * | | | | | Merge branch 'tree_item_limit' into 'master' | Douwe Maan | 2017-11-15 | 3 | -4/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate tree to max 1,000 items and display notice to users Closes #39746 See merge request gitlab-org/gitlab-ce!15333 | ||||
| | * | | | | | Truncate tree to max 1,000 items and display notice to users | Drew Blessing | 2017-11-15 | 3 | -4/+25 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | Merge branch ↵ | Douwe Maan | 2017-11-15 | 4 | -10/+20 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master' Resolve "Only one note webhook is triggered when a comment with time spent is added" Closes #40122 See merge request gitlab-org/gitlab-ce!15381 | ||||
| | * | | | | | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added | Rémy Coutable | 2017-11-15 | 4 | -10/+20 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Fix dumping hashed storage based repository | Gabriel Mazetto | 2017-11-15 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks | Yorick Peterse | 2017-11-15 | 2 | -15/+11 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Prefer polymorphism over specific type checks in Import service See merge request gitlab-org/gitlab-ce!15397 | ||||
| | * | | | Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphism | Douwe Maan | 2017-11-15 | 2 | -15/+11 |
| | | | | | |||||
| * | | | | Merge branch 'update-merge-worker-metrics' into 'master' | Sean McGivern | 2017-11-15 | 1 | -1/+17 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add simple logging to UpdateMergeRequestsWorker#perform See merge request gitlab-org/gitlab-ce!15360 | ||||
| | * | | | | [ci-skip] lintingupdate-merge-worker-metrics | Micael Bergeron | 2017-11-14 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | rework the logging to be simpler and add a threshold | micael.bergeron | 2017-11-14 | 1 | -6/+12 |
| | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |