summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-152-3/+28
* Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-143-18/+24
|\
| * 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#pro...37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-1/+1
* | | Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-th...Douwe Maan2017-09-141-1/+2
|\ \ \ | |/ / |/| |
| * | 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
* | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-4/+21
|\ \ \
| * | | 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 datash-exclude-api-responsesStan Hu2017-09-131-1/+0
* | | | Fix: GPG tmp dir removal race conditionAlexis Reigel2017-09-131-4/+10
* | | | Merge branch '37629-lazy-image-loading-breaks-notification-mails-for-an-added...Douwe Maan2017-09-132-1/+8
|\ \ \ \
| * | | | 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 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
* | | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-1313-722/+732
|\ \ \ \ \
| * | | | | adds changelogMaxim Rydkin2017-09-121-4/+4
| * | | | | 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'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-1/+85
| | |_|/ / | |/| | |
* | | | | 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 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
|\ \ \ \
| * | | | 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 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 instanceRobin Bobbitt2017-08-211-1/+1
* | | | Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' i...Kamil Trzciński2017-09-111-2/+2
|\ \ \ \
| * | | | Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
* | | | | Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-082-85/+1
|/ / / /
* | | | Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-071-0/+3
* | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-071-1/+21
* | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-10/+23
| |/ / |/| |
* | | Merge branch '30473-allow-creation-of-subgroups-with-gitlab_default_can_creat...Douwe Maan2017-09-072-2/+7
|\ \ \
| * | | 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 '35558-only-one-garbage-collection-should-be-running-per-project...Douwe Maan2017-09-071-2/+8
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \
| * | | 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
View Lorry Controller Status