root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
98,733 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

98733 Commits

Author SHA1 Message Date
Robert Speicher d85c3f35fa
Copy private_access_spec from EE 2019-07-24 15:28:14 -05:00
Robert Speicher bfe1df68ac
Copy dashboard fixture schema from EE 2019-07-24 15:28:14 -05:00
Robert Speicher 1dc2a2f689
CE-EE parity for spec/views 2019-07-24 15:28:14 -05:00
Robert Speicher 6587d12703
CE-EE parity for interpret_service_spec 2019-07-24 15:28:14 -05:00
Douglas Barbosa Alexandre feb07ce08e Merge branch 'ce-docker_image_replication-event-generation' into 'master' 
Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597

See merge request gitlab-org/gitlab-ce!30520
 2019-07-24 20:11:49 +00:00
Stan Hu 6dcde68b6d Merge branch '48717-rate-limit-raw-controller-show' into 'master' 
Add RateLimiter to RawController

See merge request gitlab-org/gitlab-ce!30635
 2019-07-24 19:49:31 +00:00
Mayra Cabrera 3cefc5d7df Add RateLimiter to RawController 
* 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
 2019-07-24 19:49:31 +00:00
Robert Speicher b70dbabb63 Merge branch '63730-fix-500-status-labels-pd' into 'master' 
Add where condition to filter out labels with type here

Closes #63730

See merge request gitlab-org/gitlab-ce!30885
 2019-07-24 19:42:06 +00:00
Douwe Maan 50ab880f80 Merge branch 'cleanup/spec-tasks' into 'master' 
Resolves confusion within spec rake tasks.

See merge request gitlab-org/gitlab-ce!31073
 2019-07-24 18:47:23 +00:00
Douwe Maan 60701f5c52 Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' into 'master' 
Remove project param from `#show_label_issuables_link?`

Closes #62217

See merge request gitlab-org/gitlab-ce!31038
 2019-07-24 18:41:55 +00:00
Douwe Maan 85a304d2ac Merge branch 'update-author-prefix-on-merge-request-notification' into 'master' 
Update author prefix on merge request notification

See merge request gitlab-org/gitlab-ce!31057
 2019-07-24 18:40:30 +00:00
Douwe Maan b014992193 Merge branch '62128-remove-ignore-rule-for-project-auto-devops-domain' into 'master' 
Remove ignore rule for ProjectAutoDevops#domain

See merge request gitlab-org/gitlab-ce!30989
 2019-07-24 18:36:44 +00:00
Stan Hu 0d538e44af Merge branch 'optimise-import-performance' into 'master' 
Optimise import performance

Closes #64924

See merge request gitlab-org/gitlab-ce!31045
 2019-07-24 18:01:44 +00:00
Mayra Cabrera f73d65197b Merge branch '44496-outbound_requests_whitelist' into 'master' 
Add Outbound requests whitelist for local networks

See merge request gitlab-org/gitlab-ce!30350
 2019-07-24 17:59:39 +00:00
Reuben Pereira e5bdcfbc9b [ADD] outbound requests whitelist 
Signed-off-by: Istvan szalai <istvan.szalai@savoirfairelinux.com>
 2019-07-24 17:59:38 +00:00
Douglas Barbosa Alexandre 6a5d2df3ee Merge branch 'sh-peek-cleanup' into 'master' 
Use a base class for Peek views

See merge request gitlab-org/gitlab-ce!31108
 2019-07-24 17:45:01 +00:00
Paul Slaughter d86ef0b00f Merge branch '63553-remove-pluralize-in-favour-of-n__' into 'master' 
Resolve "Remove `pluralize` in favour of `n__`"

Closes #63553

See merge request gitlab-org/gitlab-ce!30882
 2019-07-24 17:39:18 +00:00
Ezekiel Kigbo 78d57823ca Removed pluralize function 
Replaced instance of the `pluralize` js function
with `n__` to follow our development guide.
 2019-07-24 17:39:18 +00:00
Rémy Coutable 945eb2aeee Merge branch 'remove-unused-peek-views' into 'master' 
Remove unused peek view code

See merge request gitlab-org/gitlab-ce!31099
 2019-07-24 17:35:37 +00:00
Nick Thomas e7f795a390 Merge branch 'ab-count-strategies' into 'master' 
Remove feature flag for tablesample counts

See merge request gitlab-org/gitlab-ce!31048
 2019-07-24 17:00:35 +00:00
Andreas Brandl 259493bb4c Enable tablesample count strategy by default 
https://gitlab.com/gitlab-org/gitlab-ce/issues/58792
 2019-07-24 17:00:34 +00:00
Clement Ho 25698fda23 Merge branch 'rverissimo-master-patch-43755' into 'master' 
Update tooltip values to meet design specs

Closes gitlab-ui#264

See merge request gitlab-org/gitlab-ce!30981
 2019-07-24 16:33:02 +00:00
Stan Hu d7eadcc0f3 Use a base class for Peek views 
Introduce a `DetailedView` base class, which is inherited by
the Gitaly, Redis, and Rugged views. This reduces code duplication.
 2019-07-24 08:57:42 -07:00
Marcia Ramos 5c69b781b8 Merge branch 'docs/tidy-up-chaos-endpoint' into 'master' 
Followup edit of documentation

See merge request gitlab-org/gitlab-ce!30986
 2019-07-24 15:47:06 +00:00
Evan Read dee72df589 Followup edit of documentation 2019-07-24 15:47:06 +00:00
Valery Sizov 1902d9cc74 Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597 
This is the first part of Docker Registry replication
    for secondary Geo node.
 2019-07-24 17:56:48 +03:00
Sean McGivern c02c83fa9b Merge branch '64998-increase-helm-deploy-command-timeout' into 'master' 
Increase the Review App deploy command timeout to 15 minutes

Closes #64998

See merge request gitlab-org/gitlab-ce!31061
 2019-07-24 14:29:21 +00:00
Kamil Trzciński 8d1e97fc3b Optimise import performance 
- 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`
 2019-07-24 16:24:28 +02:00
Grzegorz Bizon 2a07275121 Merge branch 'mc/feature/use-only-pat-cicd-projects' into 'master' 
Remove OAuth GitHub CI/CD project code paths

See merge request gitlab-org/gitlab-ce!30716
 2019-07-24 14:01:22 +00:00
Mike Greiling f987e03c42 Merge branch 'add-project-selection-to-cycle-analytics-service' into 'master' 
Add projectIds to CA service

See merge request gitlab-org/gitlab-ce!30894
 2019-07-24 13:59:28 +00:00
Brandon Labuschagne 68d1a9a306 Add projectIds to CA service 2019-07-24 13:59:23 +00:00
Marcia Ramos 1a123b36e3 Merge branch 'docs/fix-more-errors' into 'master' 
Fix some errors in Markdown files

See merge request gitlab-org/gitlab-ce!30822
 2019-07-24 13:32:16 +00:00
Evan Read a0adccd210 Fix some errors in Markdown files 2019-07-24 13:32:15 +00:00
Marcia Ramos 9e7fdb7111 Merge branch 'docs/better-blocked-user-docs' into 'master' 
Better information on blocking users

Closes #61255 and #53748

See merge request gitlab-org/gitlab-ce!30767
 2019-07-24 13:28:47 +00:00
Evan Read b8683c266d Better information on blocking users 2019-07-24 13:28:46 +00:00
Marcia Ramos e9121227a1 Merge branch 'docs/tidy-auto-devops-topic' into 'master' 
Improve the Auto DevOps topic a bit

See merge request gitlab-org/gitlab-ce!30721
 2019-07-24 13:25:56 +00:00
Evan Read 9a5ffe4057 Improve the Auto DevOps topic a bit 2019-07-24 13:25:55 +00:00
Marcia Ramos d724935728 Merge branch 'docs-markdown-header-lint' into 'master' 
Docs: Clean up headers in markdown

See merge request gitlab-org/gitlab-ce!30597
 2019-07-24 13:10:07 +00:00
Marcel Amirault 74a34e8b7b Clean up headers in markdown 
Some markdown headers needed tweaking to adhere
to standards, including blank lines above and below,
only one space after hash, first header should be
h1, and only one h1 per doc
 2019-07-24 13:10:06 +00:00
Marcia Ramos 0ef53789ea Merge branch 'docs/enhance-code-quality-topics' into 'master' 
Improve code quality documentation

Closes #60725

See merge request gitlab-org/gitlab-ce!30545
 2019-07-24 13:07:43 +00:00
Evan Read ea2a64c3ac Improve code quality documentation 2019-07-24 13:07:42 +00:00
Marcia Ramos 3e4b15a37a Merge branch '64243-design-management-docs' into 'master' 
PerhAdd documentation for Design Management feature

See merge request gitlab-org/gitlab-ce!30448
 2019-07-24 13:02:26 +00:00
Marcia Ramos 8fce2ae89a Merge branch 'docs/add-go-test-guidelines' into 'master' 
Add Go test guidelines

See merge request gitlab-org/gitlab-ce!29159
 2019-07-24 12:58:16 +00:00
Steve Azzopardi 105bb6ffca Add Go test guidelines 2019-07-24 12:58:15 +00:00
Marcia Ramos eebc9cb67e Merge branch 'docs/cross-link-kaniko' into 'master' 
Improve GitLab and Docker configuration docs

Closes #31379

See merge request gitlab-org/gitlab-ce!30498
 2019-07-24 12:25:44 +00:00
Evan Read 047a77c990 Cross link to kaniko docs 
Also make security warning more visible and
improves instructions.
 2019-07-24 12:25:43 +00:00
Sean McGivern 562db3a36e Merge branch 'sh-add-rugged-to-peek' into 'master' 
Add Rugged calls to performance bar

See merge request gitlab-org/gitlab-ce!30983
 2019-07-24 12:24:12 +00:00
Sean McGivern 74f0faa27c Remove unused peek view code 
We haven't needed these since we started rendering the performance bar
in Vue.
 2019-07-24 13:15:13 +01:00
Fatih Acet 32aa7bd674 Merge branch '12250-mvc-security-navigation-section-group' into 'master' 
Add "security" top-level item to group sidebar

See merge request gitlab-org/gitlab-ce!30604
 2019-07-24 11:30:50 +00:00
Fatih Acet a34654f374 Merge branch '12250-mvc-security-navigation-section-project' into 'master' 
Add "Security & Compliance" as top-level item to the project sidebar

See merge request gitlab-org/gitlab-ce!30564
 2019-07-24 11:29:07 +00:00