summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-181-0/+1
|\
| * Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-161-0/+1
* | Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-181-7/+17
|\ \
| * | Clean up read_registry scope changesRobin Bobbitt2017-09-181-7/+17
| |/
* | Merge branch 'operation-service-merge' into 'master'Rémy Coutable2017-09-182-1/+43
|\ \
| * | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-152-1/+43
| |/
* | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'Douwe Maan2017-09-182-0/+129
|\ \
| * | Spread out the work a littleMichael Kozono2017-09-141-3/+43
| * | Extract helper for queuing background jobsMichael Kozono2017-09-141-0/+48
| * | Simplify queryMichael Kozono2017-09-141-15/+4
| * | Add specs for deleting conflicting redirectsMichael Kozono2017-09-141-2/+2
| * | Delete conflicting redirects in backgroundMichael Kozono2017-09-141-0/+52
| |/
* | Ensure we use `Entities::User` for non-admin `users/:id` API requestsRobert Speicher2017-09-151-1/+1
* | 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
View Lorry Controller Status