summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-143-18/+24
|\ | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254
| * Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-143-18/+24
| |
* | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'Grzegorz Bizon2017-09-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
| * | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Douwe Maan2017-09-141-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-121-1/+2
| | | | | | | | | | | | updated the spec
* | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-4/+21
|\ \ \ | | | | | | | | | | | | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150
| * | | Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-111-4/+21
| | | |
* | | | Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-131-1/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245
| * | | Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responsesStan Hu2017-09-131-1/+0
| | | |
* | | | Fix: GPG tmp dir removal race conditionAlexis Reigel2017-09-131-4/+10
| | | |
* | | | Merge branch ↵Douwe Maan2017-09-132-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot' into 'master' Resolve "Lazy image loading breaks notification mails for an added screenshot" Closes #37629 See merge request !14161
| * | | | Remove ImageLazyLoadFilter from EmailPipeline37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshotRobert Speicher2017-09-122-1/+8
| |/ / /
* | | | Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-131-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162
| * | | | Add auto devops enabled/disabled to usage pingZeger-Jan van de Weg2017-09-121-0/+2
| | | | |
| * | | | Add usage ping for Auto DevOpsZeger-Jan van de Weg2017-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648
* | | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-1313-722/+732
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | | | | adds changelogMaxim Rydkin2017-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI
| * | | | | move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb`Maxim Rydkin2017-09-123-10/+12
| | | | | |
| * | | | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-123-252/+254
| | | | | |
| * | | | | move `lib/ci/model.rb` into `lib/gitlab/ci/model.rb`Maxim Rydkin2017-09-122-11/+13
| | | | | |
| * | | | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-122-116/+118
| | | | | |
| * | | | | move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb`Maxim Rydkin2017-09-123-333/+335
| | | | | |
* | | | | | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-122-1/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190
| * | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-1/+85
| | |_|/ / | |/| | | | | | | | This reverts merge request !14148
* | | | | Decrease Cyclomatic Complexity threshold to 13Maxim Rydkin2017-09-122-19/+36
| | | | |
* | | | | Merge branch 'gitaly-519-commit-stats' into 'master'Robert Speicher2017-09-123-2/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077
| * | | | Migrate Git::CommitStats to Gitalygitaly-519-commit-statsKim "BKC" Carlbäcker2017-09-113-2/+27
| |/ / /
* | | | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-121-1/+1
| | | |
* | | | Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-123-0/+151
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Detect orphaned repositories See merge request !14204
| * | | | Refactor on namespace and repository checks and added specsGabriel Mazetto2017-09-123-33/+67
| | | | |
| * | | | Detect orphaned repositories and namespaces in any storageGabriel Mazetto2017-09-123-0/+117
| |/ / /
* | | | Merge branch '36953-add-gitLab-pages-version-to-admin-dashboard' into 'master'Rémy Coutable2017-09-121-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab-Pages version to Admin Dashboard Closes #36953 See merge request !14040
| * | | | Add GitLab-Pages version to Admin DashboardTravis Miller2017-09-071-0/+5
| | |/ / | |/| |
* | | | Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'Kamil Trzciński2017-09-121-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Hide read_registry scope when registry is disabled on instance See merge request !13314
| * | | Hide read_registry scope when registry is disabled on instanceRobin Bobbitt2017-08-211-1/+1
| | | |
* | | | Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' ↵Kamil Trzciński2017-09-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport the EE signature of Gitlab::Workhorse#send_artifacts_entry See merge request !14144
| * | | | Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-082-85/+1
|/ / / / | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* | | | Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-071-0/+3
| | | | | | | | | | | | | | | | | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166
* | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-071-1/+21
| | | | | | | | | | | | | | | | | | | | [9.5] Limit `style` attribute on `th` and `td` elements to specific properties See merge request gitlab/gitlabhq!2155
* | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-10/+23
| |/ / |/| | | | | | | | | | | Fix XSS issue in go-get handling See merge request !2128
* | | Merge branch ↵Douwe Maan2017-09-072-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-false' into 'master' Make Members with Owner and Master roles always able to create subgroups Closes #30473 See merge request !14046
| * | | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-072-2/+7
| | |/ | |/|
* | | Merge branch ↵Douwe Maan2017-09-071-2/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036
| * | Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-071-2/+8
| | |
* | | Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-072-0/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * | | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-073-9/+21
| | | |
| * | | Fix Rubocop failures in API loggerStan Hu2017-09-072-4/+5
| | | |
| * | | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-062-0/+17
| |/ / | | | | | | | | | Closes #36189
View Lorry Controller Status