summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Extract deploy functions in a base imageextract_auto_deploy_into_base_imageThong Kuah2019-07-253-376/+53
| | | | https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image
* Merge branch ↵Paul Slaughter2019-07-242-1/+6
|\ | | | | | | | | | | | | | | | | '64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded' into 'master' Changed `author_avatar` to inline-block class Closes #64746 See merge request gitlab-org/gitlab-ce!30904
| * Changed `author_avatar` to inline-block classMarc Schwede2019-07-242-1/+6
|/ | | | Fixes #64746
* Merge branch '64763-fix-tags-page-layout' into 'master'Fatih Acet2019-07-242-1/+6
|\ | | | | | | | | Fix tags page layout See merge request gitlab-org/gitlab-ce!30951
| * Fix tags page layoutAndré Luís2019-07-242-1/+6
|/
* Merge branch 'sh-enable-rubocop-hash-search' into 'master'Mayra Cabrera2019-07-245-15/+4
|\ | | | | | | | | | | | | Enable Rubocop Performance/InefficientHashSearch Closes #64975 See merge request gitlab-org/gitlab-ce!31117
| * Enable Rubocop Performance/InefficientHashSearchsh-enable-rubocop-hash-searchStan Hu2019-07-245-15/+4
| | | | | | | | | | | | | | | | | | When used with a Hash, `.keys.include?` is bad because: 1. It performs a O(n) search instead of the efficient `.has_key?` 2. It clones all keys into separate array. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64975
* | Merge branch 'ce-docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-247-0/+83
|\ \ | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597 See merge request gitlab-org/gitlab-ce!30520
| * | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-247-0/+83
| | | | | | | | | | | | | | | This is the first part of Docker Registry replication for secondary Geo node.
* | | Merge branch '48717-rate-limit-raw-controller-show' into 'master'Stan Hu2019-07-2412-17/+291
|\ \ \ | | | | | | | | | | | | | | | | Add RateLimiter to RawController See merge request gitlab-org/gitlab-ce!30635
| * | | Add RateLimiter to RawControllerMayra Cabrera2019-07-2412-17/+291
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * Limits raw requests to 300 per minute and per raw path. * Add a new attribute to ApplicationSettings so user can change this value on their instance. * Uses Gitlab::ActionRateLimiter to limit the raw requests. * Add a new method into ActionRateLimiter to log the event into auth.log Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/48717
* | | Merge branch '63730-fix-500-status-labels-pd' into 'master'Robert Speicher2019-07-243-1/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add where condition to filter out labels with type here Closes #63730 See merge request gitlab-org/gitlab-ce!30885
| * | | Add where condition to filter out invalid labels with nil type63730-fix-500-status-labels-pdPatrick Derichs2019-07-243-1/+19
| | | |
* | | | Merge branch 'cleanup/spec-tasks' into 'master'Douwe Maan2019-07-243-62/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolves confusion within spec rake tasks. See merge request gitlab-org/gitlab-ce!31073
| * | | | Resolves confusion within spec rake taskscleanup/spec-tasksJeremy Jackson2019-07-233-62/+6
| | | | |
* | | | | Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' ↵Douwe Maan2019-07-243-26/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove project param from `#show_label_issuables_link?` Closes #62217 See merge request gitlab-org/gitlab-ce!31038
| * | | | | Remove project from show_label_issuables_link?62217-follow-up-from-fix-display-of-promote-to-group-labelHeinrich Lee Yu2019-07-233-26/+7
| | | | | | | | | | | | | | | | | | | | | | | | The project param is unnecessary here
* | | | | | Merge branch 'update-author-prefix-on-merge-request-notification' into 'master'Douwe Maan2019-07-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update author prefix on merge request notification See merge request gitlab-org/gitlab-ce!31057
| * | | | | | Update author prefix on merge request notificationGeorge Tsiolis2019-07-231-1/+1
| | | | | | |
* | | | | | | Merge branch '62128-remove-ignore-rule-for-project-auto-devops-domain' into ↵Douwe Maan2019-07-242-5/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove ignore rule for ProjectAutoDevops#domain See merge request gitlab-org/gitlab-ce!30989
| * | | | | | Remove ignore rule for ProjectAutoDevops#domain62128-remove-ignore-rule-for-project-auto-devops-domainTiger2019-07-222-5/+1
| | | | | | |
* | | | | | | Merge branch 'optimise-import-performance' into 'master'Stan Hu2019-07-2410-34/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise import performance Closes #64924 See merge request gitlab-org/gitlab-ce!31045
| * | | | | | | Optimise import performanceoptimise-import-performanceKamil Trzciński2019-07-2410-34/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix `O(n)` complexity of `append_or_update_attribute`, we append objects to an array and re-save project - Remove the usage of `keys.include?` as it performs `O(n)` search, instead use `.has_key?` - Remove the usage of `.keys.first` as it performs a copy of all keys, instead use `.first.first`
* | | | | | | | Merge branch '44496-outbound_requests_whitelist' into 'master'Mayra Cabrera2019-07-2415-88/+394
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Outbound requests whitelist for local networks See merge request gitlab-org/gitlab-ce!30350
| * | | | | | | | [ADD] outbound requests whitelistReuben Pereira2019-07-2415-88/+394
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Istvan szalai <istvan.szalai@savoirfairelinux.com>
* | | | | | | | Merge branch 'sh-peek-cleanup' into 'master'Douglas Barbosa Alexandre2019-07-245-72/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a base class for Peek views See merge request gitlab-org/gitlab-ce!31108
| * | | | | | | | Use a base class for Peek viewssh-peek-cleanupStan Hu2019-07-245-72/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a `DetailedView` base class, which is inherited by the Gitaly, Redis, and Rugged views. This reduces code duplication.
* | | | | | | | | Merge branch '63553-remove-pluralize-in-favour-of-n__' into 'master'Paul Slaughter2019-07-246-36/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove `pluralize` in favour of `n__`" Closes #63553 See merge request gitlab-org/gitlab-ce!30882
| * | | | | | | | | Removed pluralize functionEzekiel Kigbo2019-07-246-36/+21
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced instance of the `pluralize` js function with `n__` to follow our development guide.
* | | | | | | | | Merge branch 'remove-unused-peek-views' into 'master'Rémy Coutable2019-07-244-27/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused peek view code See merge request gitlab-org/gitlab-ce!31099
| * | | | | | | | | Remove unused peek view coderemove-unused-peek-viewsSean McGivern2019-07-244-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We haven't needed these since we started rendering the performance bar in Vue.
* | | | | | | | | | Merge branch 'ab-count-strategies' into 'master'Nick Thomas2019-07-249-78/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature flag for tablesample counts See merge request gitlab-org/gitlab-ce!31048
| * | | | | | | | | | Enable tablesample count strategy by defaultAndreas Brandl2019-07-249-78/+12
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58792
* | | | | | | | | | Merge branch 'rverissimo-master-patch-43755' into 'master'64970-cannot-click-open-a-dropdown-merge-button-in-merge-requestsClement Ho2019-07-242-3/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update tooltip values to meet design specs Closes gitlab-ui#264 See merge request gitlab-org/gitlab-ce!30981
| * | | | | | | | | | Update tooltip values to meet design specsrverissimo-master-patch-43755Rayana Verissimo2019-07-202-3/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/tidy-up-chaos-endpoint' into 'master'Marcia Ramos2019-07-242-10/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup edit of documentation See merge request gitlab-org/gitlab-ce!30986
| * | | | | | | | | | Followup edit of documentationEvan Read2019-07-242-10/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '64998-increase-helm-deploy-command-timeout' into 'master'Sean McGivern2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the Review App deploy command timeout to 15 minutes Closes #64998 See merge request gitlab-org/gitlab-ce!31061
| * | | | | | | | | | Increase the Review App deploy timeout to 15 minutes64998-increase-helm-deploy-command-timeoutRémy Coutable2019-07-231-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'mc/feature/use-only-pat-cicd-projects' into 'master'Grzegorz Bizon2019-07-242-2/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove OAuth GitHub CI/CD project code paths See merge request gitlab-org/gitlab-ce!30716
| * | | | | | | | | | Do not authorize with OAuth for CICD only projectsmc/feature/use-only-pat-cicd-projectsMatija Čupić2019-07-232-2/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'add-project-selection-to-cycle-analytics-service' into 'master'Mike Greiling2019-07-241-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add projectIds to CA service See merge request gitlab-org/gitlab-ce!30894
| * | | | | | | | | | | Add projectIds to CA serviceBrandon Labuschagne2019-07-241-2/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/fix-more-errors' into 'master'Marcia Ramos2019-07-244-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some errors in Markdown files See merge request gitlab-org/gitlab-ce!30822
| * | | | | | | | | | | Fix some errors in Markdown filesEvan Read2019-07-244-5/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/better-blocked-user-docs' into 'master'Marcia Ramos2019-07-243-41/+115
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better information on blocking users Closes #61255 and #53748 See merge request gitlab-org/gitlab-ce!30767
| * | | | | | | | | | | Better information on blocking usersEvan Read2019-07-243-41/+115
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/tidy-auto-devops-topic' into 'master'Marcia Ramos2019-07-242-52/+53
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the Auto DevOps topic a bit See merge request gitlab-org/gitlab-ce!30721
| * | | | | | | | | | | Improve the Auto DevOps topic a bitEvan Read2019-07-242-52/+53
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-markdown-header-lint' into 'master'Marcia Ramos2019-07-2412-18/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clean up headers in markdown See merge request gitlab-org/gitlab-ce!30597