summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Avoid calling freeze on already frozen strings in app/modelsdineshpanda2019-09-0130-45/+45
|
* Merge branch 'qa-fix-qa-project-show-page-object' into 'master'Stan Hu2019-08-311-1/+1
|\ | | | | | | | | Add EE methods to Project Show page object See merge request gitlab-org/gitlab-ce!32489
| * Add EE methods to Project Show page objectJennifer Louie2019-08-311-1/+1
|/
* Merge branch 'update-jira-ruby-to-1.7.1' into 'master'Lin Jen-Shin2019-08-314-3/+14
|\ | | | | | | | | Update jira-ruby to 1.7.1 See merge request gitlab-org/gitlab-ce!32436
| * Update jira-ruby to 1.7.1Takuya Noguchi2019-08-304-3/+14
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'qa/increase-window-size-during-e2e-tests' into 'master'Tanya Pazitny2019-08-301-1/+1
|\ \ | | | | | | | | | | | | Increase window size during e2e tests See merge request gitlab-org/gitlab-ce!32471
| * | Increase window size during e2e testsqa/increase-window-size-during-e2e-testsqa-window-size-jlWalmyr Lima2019-08-301-1/+1
| | |
* | | Merge branch 'remove-ignorable-column-concern' into 'master'Michael Kozono2019-08-3012-111/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove dependency on IgnorableColumn concern Closes #66746 See merge request gitlab-org/gitlab-ce!32427
| * | | Use self.ignored_columns += instead of =Stan Hu2019-08-307-26/+25
| | | | | | | | | | | | | | | | This is to accomodate prepended modules.
| * | | Remove dependency on IgnorableColumn concerndineshpanda2019-08-3012-110/+29
| | | |
* | | | Merge branch '66454-create-feature-flag' into 'master'Mayra Cabrera2019-08-3010-2/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Creates Feature Flag for job log See merge request gitlab-org/gitlab-ce!32154
| * | | | Creates Feature Flag for job logFilipa Lacerda2019-08-3010-2/+48
|/ / / / | | | | | | | | | | | | | | | | Updates frontend code and specs to allow for the new feature flag
* | | | Merge branch '12055-public-mr-approval-rules-api-ce' into 'master'Robert Speicher2019-08-301-4/+268
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Doc: Add documentation about public MR-level API See merge request gitlab-org/gitlab-ce!32133
| * | | | Doc: Fix order of sections12055-public-mr-approval-rules-api-cePatrick Bajao2019-08-301-81/+81
| | | | |
| * | | | Doc: Update POST/PUT endpoints to use *_ids paramsPatrick Bajao2019-08-301-8/+8
| | | | |
| * | | | Doc: Fix type of users and groups paramsPatrick Bajao2019-08-301-8/+8
| | | | |
| * | | | Doc: Add info about update/delete restrictionPatrick Bajao2019-08-301-1/+7
| | | | |
| * | | | Doc: Add documentation about public MR-level APIPatrick Bajao2019-08-301-0/+258
| | | | |
* | | | | Merge branch '28643-access-request-emails-limit-to-ten-owners' into 'master'Mayra Cabrera2019-08-3013-43/+258
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Limit access request emails to ten most recently active owners/maintainers" See merge request gitlab-org/gitlab-ce!32141
| * | | | | Limit access request email to 10 most recently active owners/maintainersManoj MJ2019-08-3013-43/+258
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This change limits the number of emails for new access requests notifications to 10 most recently active owners/maintainers
* | | | | Merge branch 'docs-improve-site-deployment-ux' into 'master'Achilleas Pipinellis2019-08-301-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added expected site deployment wait time See merge request gitlab-org/gitlab-ce!32474
| * | | | | Added expected site deployment wait timeMatt Penna2019-08-301-4/+6
|/ / / / /
* | | | | Merge branch '56295-some-avatars-not-visible-in-commit-trailers' into 'master'Lin Jen-Shin2019-08-305-5/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #56295 - Some Avatars In Commit Trailers Not Visible Closes #56295 See merge request gitlab-org/gitlab-ce!32374
| * | | | | Fix for #56295, https://gitlab.com/gitlab-org/gitlab-ce/issues/56295.Jesse Hall2019-08-305-5/+75
|/ / / / / | | | | | | | | | | | | | | | All avatars now visible in commit trailers.
* | | | | Merge branch '66685-add-production-fixture' into 'master'Stan Hu2019-08-302-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add production fixture to create instance administration project See merge request gitlab-org/gitlab-ce!32467
| * | | | | Add production fixture to create projectReuben Pereira2019-08-302-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Since migrations are not run by new instances, add a production fixture that should ensure that the self-monitoring project is created for new instances as well.
* | | | | Merge branch '12874-extend-group-ip-restriction-to-command-line-ce-docs' ↵Michael Kozono2019-08-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Extend group IP restriction to command line -docs update - backport See merge request gitlab-org/gitlab-ce!32151
| * | | | | Update docs fileGosia Ksionek2019-08-301-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelod Remove changelog Apply suggestion to doc/user/group/index.md
* | | | | Merge branch 'fix-nil-deployable-exception-on-job-controller-show' into 'master'Grzegorz Bizon2019-08-304-1/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix users cannot access job detail page when deployable does not exist Closes #65216 See merge request gitlab-org/gitlab-ce!32247
| * | | | | Fix deployable nil exception on job controllerfix-nil-deployable-exception-on-job-controller-showShinya Maeda2019-08-304-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | When deployable is nil, we gracefully take care of the case.
* | | | | | Merge branch 'an-fix-histogram-bug' into 'master'12-3-auto-deploy-20190830Kamil Trzciński2019-08-302-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for histogram corruption in Sidekiq See merge request gitlab-org/gitlab-ce!32453
| * | | | | | Fix for histogram corruption in SidekiqAndrew Newdigate2019-08-302-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in which sidekiq histograms contain invalid labels. See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7729 for more details.
* | | | | | Merge branch 'move-ee-ci-config-to-ce' into 'master'Lin Jen-Shin2019-08-302-0/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use ee/.gitlab/ for CI config files See merge request gitlab-org/gitlab-ce!32351
| * | | | | | Don't use ee/.gitlab/ for CI config filesmove-ee-ci-config-to-ceYorick Peterse2019-08-282-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are not available in CE, resulting in CI pipeline failures when trying to include these files. Since the job is already configured to only run on EE, we can just include it in both CE and EE.
* | | | | | | Merge branch '12846-update-security-dashboard-docs' into 'master'Achilleas Pipinellis2019-08-303-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation for security dashboard See merge request gitlab-org/gitlab-ce!32205
| * | | | | | | Update documentation for security dashboardDave Pisek2019-08-303-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates a screenshot and the description of the documentation of the group security dashboard to it is in sync with the latest version of the dashboard.
* | | | | | | | Merge branch 'docs-es-web-indexing' into 'master'Achilleas Pipinellis2019-08-301-123/+176
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document ES web indexing See merge request gitlab-org/gitlab-ce!31972
| * | | | | | | | Document ES web indexingMarkus Koller2019-08-301-123/+176
|/ / / / / / / /
* | | | | | | | Merge branch 'tr-embed-grafana-image-docs' into 'master'Achilleas Pipinellis2019-08-302-0/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for embedding Grafana live charts as images Closes #66662 See merge request gitlab-org/gitlab-ce!32342
| * | | | | | | | Remove changelog file againTristan Read2019-08-302-0/+21
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/66684
* | | | | | | | Merge branch 'cert_manager_v0_9' into 'master'Kamil Trzciński2019-08-303-11/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install cert-manager v0.9.1 See merge request gitlab-org/gitlab-ce!32243
| * | | | | | | | Install cert-manager v0.9.1James Fargher2019-08-303-11/+54
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This does not support upgrading from earlier versions
* | | | | | | | Merge branch 'ab-routable-two-step-search' into 'master'Jan Provaznik2019-08-302-3/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform two-step Routable lookup by path See merge request gitlab-org/gitlab-ce!32272
| * | | | | | | | Add another counter to calculate method call ratioab-routable-two-step-searchAndreas Brandl2019-08-301-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should see the ratio drop down when enabling the Feature. Recommendation by @andrewn
| * | | | | | | | Add method call count instrumentationAndreas Brandl2019-08-301-0/+11
| | | | | | | | |
| * | | | | | | | Perform two-step Routable lookup by pathAndreas Brandl2019-08-302-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to lookup a Project or Namespace by path, we prefer an exact match (case-sensitive) but in absence of that, we'd also take a case-insensitive match. The case-insensitive matching with preference for the exact match is a bit more involved in SQL as the exact lookup. Yet, the majority of cases will be an exact match. The thinking here is that we can optimize the lookup by performing an exact match first and only if there is no result, we perform the case-insensitive lookup. Data for GitLab.com: * We have about 15M records in routes table * About 2,500 routes exist where there's more than one record with the same `lower(path)` It is possible for a user to craft requests that would always trigger the 2-step search (e.g. we have a route for `/foo/bar`, the request is always for `/FOO/bar`). In this case, the change at hand is not beneficial as it would run an additional query. However, based on the data, it is highly likely that the vast majority of requests can be satisfied with an exact match only. The context for this change is https://gitlab.com/gitlab-org/gitlab-ce/issues/64590#note_208156463.
* | | | | | | | | Merge branch 'ce-issue_10770' into 'master'Andreas Brandl2019-08-305-2/+41
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Rename epic column state to state_id See merge request gitlab-org/gitlab-ce!32270
| * | | | | | | | Rename epic column state to state_idFelipe Artur2019-08-305-2/+41
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename epic column state to state_id to be consistent with issues and merge requests
* | | | | | | | Merge branch 'docs/add-github-oauth-note' into 'master'Achilleas Pipinellis2019-08-302-38/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about GitHub OAuth See merge request gitlab-org/gitlab-ce!32041
| * | | | | | | | Add note about GitHub OAuthEvan Read2019-08-302-38/+13
|/ / / / / / / /