summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Handle EE edge cases in issues.closed_at migrationbetter-issues-closed-at-cleanupYorick Peterse2018-02-051-3/+16
| | | | | | | | | EE seems to have had an outdated schema at some point, leading to some environments not having the right columns in place. This adjusts the migration for `issues.closed_at` so it takes care of those cases, ensuring data can be migrated properly. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/4803
* Merge branch '39985-enable-prometheus-metrics-for-deployed-ingresses' into ↵Kamil Trzciński2018-02-055-5/+26
|\ | | | | | | | | | | | | | | | | 'master' Enable Prometheus metrics for deployed Ingresses Closes #39985 See merge request gitlab-org/gitlab-ce!16866
| * Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-055-5/+26
| |
* | Merge branch ↵Kamil Trzciński2018-02-051-77/+97
|\ \ | |/ |/| | | | | | | | | | | | | '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1' into 'master' Adapt config to support Prometheus 2.1 Closes #42496 and #42498 See merge request gitlab-org/gitlab-ce!16749
| * Adapt config to support Prometheus 2.1Joshua Lambert2018-02-051-77/+97
|/
* Merge branch '42270-fix-namespace-remove-exports-for-hashed-storage' into ↵Rémy Coutable2018-02-059-46/+120
|\ | | | | | | | | | | | | | | | | 'master' Fix export removal for hashed-storage projects within a renamed or deleted namespace Closes #42270 See merge request gitlab-org/gitlab-ce!16658
| * Fix export removal for hashed-storage projects within a renamed or deleted ↵Nick Thomas2018-02-059-46/+120
| | | | | | | | namespace
* | Merge branch 'api-guard' into 'master'Rémy Coutable2018-02-051-1/+5
|\ \ | | | | | | | | | | | | Make find_user_from_sources extensible for EE See merge request gitlab-org/gitlab-ce!16924
| * | Make find_user_from_sources extensible for EELin Jen-Shin2018-02-051-1/+5
| | |
* | | Merge branch 'osw-markdown-bypass-for-commit-messages' into 'master'Sean McGivern2018-02-053-27/+37
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Bypass markdown for commit titles on MR notes Closes #37616 See merge request gitlab-org/gitlab-ce!16883
| * | Remove unnused escape_html methodosw-markdown-bypass-for-commit-messagesOswaldo Ferreira2018-02-021-4/+0
| | |
| * | Bypass commits title markdown on notesOswaldo Ferreira2018-02-023-23/+37
| | |
* | | Merge branch 'gitaly-user-squash' into 'master'Rémy Coutable2018-02-055-28/+114
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Incorporate OperationService.UserSquash Gitaly RPC Closes gitaly#991 See merge request gitlab-org/gitlab-ce!16899
| * | | Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squashAlejandro Rodríguez2018-02-025-28/+114
| | | |
* | | | Merge branch 'zj-fix-flay' into 'master'Rémy Coutable2018-02-054-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flay not detecting identical code Closes #42628 See merge request gitlab-org/gitlab-ce!16828
| * | | | Ignore Flay failuresZeger-Jan van de Weg2018-01-311-0/+2
| | | | |
| * | | | Upgrade Flay to have fewer parsing errorsZeger-Jan van de Weg2018-01-312-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gem is updated from 2.8 to 2.10. [changelog][1] [1]: https://github.com/seattlerb/flay/blob/master/History.rdoc
| * | | | Fix flay not detecting identical codeZeger-Jan van de Weg2018-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the script checked only for 'Similar code', but flay will tell users when IDENTICAL code is detected too. This should create a commit will create a failing pipeline, and to check that it does this commit is pushed. Fixes #42628
* | | | | Merge branch 'sh-backport-groups-api-optimization' into 'master'Rémy Coutable2018-02-051-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport /api/v4/groups N+1 query check from EE See merge request gitlab-org/gitlab-ce!16913
| * | | | | Backport /api/v4/groups N+1 query check from EEsh-backport-groups-api-optimizationStan Hu2018-02-031-0/+15
| | | | | |
* | | | | | Merge branch 'dz-sast-confidence-level' into 'master'Rémy Coutable2018-02-051-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change SAST confidence level in .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!16831
| * | | | | | Change SAST confidence level in .gitlab-ci.ymldz-sast-confidence-levelDmitriy Zaporozhets2018-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-0538-0/+682
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track and act upon the number of executed SQL queries See merge request gitlab-org/gitlab-ce!16466
| * | | | | | | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-0138-0/+682
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we have more visibility in the number of SQL queries that are executed in web requests. The current threshold is hardcoded to 100 as we will rarely (maybe once or twice) change it. In production and development we use Sentry if enabled, in the test environment we raise an error. This feature is also only enabled in production/staging when running on GitLab.com as it's not very useful to other users.
* | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-051-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md with a link to the Contributing page on about.gitlab.com See merge request gitlab-org/gitlab-ce!16872
| * | | | | | | Update CONTRIBUTING.md with a link to the Contributing page on about.gitlab.comConnor Shea2018-02-011-0/+3
| | | | | | | |
* | | | | | | | Merge branch '25327-coverage-badge-rounding' into 'master'Rémy Coutable2018-02-055-9/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Change rounding on code coverage badge to be consistent with other displays See merge request gitlab-org/gitlab-ce!10083
| * | | | | | | Change coverage badge rounding for other CI system consistencyJeff Stubler2018-02-015-9/+24
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '42023-fix-cdn-host-documentation' into 'master'Stan Hu2018-02-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Specifying asset host produces broken URL" Closes #42023 See merge request gitlab-org/gitlab-ce!16915
| * | | | | | | Document that GITLAB_CDN_HOST takes an base URLBastian Blank2018-02-041-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* | | | | | | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-046-29/+99
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client changes for Tag,BranchNamesContainingCommit See merge request gitlab-org/gitlab-ce!16789
| * \ \ \ \ \ \ Merge branch 'master' into 'zj-ref-contains'zj-ref-containsDouwe Maan2018-02-0159-223/+839
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/git/repository.rb
| * | | | | | | | Remove intermediate methods on Branch and Tag classesZeger-Jan van de Weg2018-02-014-28/+17
| | | | | | | | |
| * | | | | | | | Fix encoding issues when name is not UTF-8Zeger-Jan van de Weg2018-02-011-2/+8
| | | | | | | | |
| * | | | | | | | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-016-34/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of gitlab-org/gitaly#884, this commit contains the client implementation for both TagNamesContaintingCommit and BranchNamesContainingCommit. The interface in the Repository model stays the same, but the implementation on the serverside, e.g. Gitaly, uses `for-each-ref`, as opposed to `branch` or `tag` which both aren't plumbing command. The result stays the same. On the serverside, we have the opportunity to limit the number of names to return. However, this is not supported on the front end yet. My proposal to use this ability: gitlab-org/gitlab-ce#42581. For now, this ability is not used as that would change more behaviours on a feature flag which might lead to unexpected changes on page refresh for example.
* | | | | | | | | Merge branch 'issue/42689-new-file-template' into 'master'Fatih Acet2018-02-042-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "After applying new file template commit change button doesn't enable" See merge request gitlab-org/gitlab-ce!16911
| * | | | | | | | Trigger change event on filename input when file template is appliedSebastian Klingler2018-02-032-1/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Follow event trigger convention
* | | | | | | | Merge branch ↵Grzegorz Bizon2018-02-033-23/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/remove-duplicated-logic-between-model-and-lib-in-find-branch' into 'master' Remove repo reloading logic from Repository#find_branch Closes #42609 See merge request gitlab-org/gitlab-ce!16815
| * | | | | | | | Remove repo reloading logic from Repository#find_branchfix/remove-duplicated-logic-between-model-and-lib-in-find-branchAhmad Sherif2018-02-023-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#find_branch has a similar logic. Fixes #42609
* | | | | | | | | Merge branch 'fix-migration-timestamp' into 'master'Stan Hu2018-02-031-0/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update labels migration timestamp to run earlier than the one that removes namespaces to avoid issues See merge request gitlab-org/gitlab-ce!16907
| * | | | | | | | | fix rubocopfix-migration-timestampJames Lopez2018-02-031-0/+2
| | | | | | | | | |
| * | | | | | | | | add migration before 20171207150343James Lopez2018-02-031-0/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-1' into 'master'Stan Hu2018-02-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling of “discrepancy” in GitHub→GitLab project import docs See merge request gitlab-org/gitlab-ce!16905
| * | | | | | | | | Fix spelling of “discrepancy” in GitHub→GitLab project import docsRory O’Kane2018-02-021-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master'Filipa Lacerda2018-02-0221-346/+660
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor CI variable list code for usage with CI/CD settings page secret variables See merge request gitlab-org/gitlab-ce!16729
| * | | | | | | | | Refactor CI variable list code for usage with CI/CD settings page secret ↵refactor-ci-variable-list-for-future-usage-in-4110Eric Eastwood2018-01-3121-346/+660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
* | | | | | | | | | Merge branch '42729-rubocop-regular-expression-check-is-breaking-master' ↵Stan Hu2018-02-021-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Rubocop regular expression check is breaking master" Closes #42729 See merge request gitlab-org/gitlab-ce!16898
| * | | | | | | | | Use %r around multi-line regular expressionsDouwe Maan2018-02-021-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-eslint-axios' into 'master'Jacob Schatz2018-02-021-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate axios import Closes #42722 See merge request gitlab-org/gitlab-ce!16891
| * | | | | | | | | Remove duplicate axios importClement Ho2018-02-021-1/+0
| | | | | | | | | |
View Lorry Controller Status