summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan2017-10-111-2/+12
* Merge branch 'fix-kubectl-180' into 'master'10-0-stable-patch-3Kamil Trzciński2017-10-031-1/+1
* Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-031-1/+2
* Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-021-1/+1
* Merge branch 'make-has-visible-commit-more-efficient' into 'master'Rémy Coutable2017-09-292-1/+33
* Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-me...Rémy Coutable2017-09-281-2/+2
* Merge branch 'zj-repo-gitaly' into 'master'Sean McGivern2017-09-281-2/+12
* Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' into...Douwe Maan2017-09-281-2/+7
* Merge branch 'dm-api-unauthorized' into 'master'Sean McGivern2017-09-282-16/+38
* Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' int...Douwe Maan2017-09-262-2/+2
* Merge branch 'rs-allow-name-on-anchors' into 'master'Douwe Maan2017-09-261-1/+2
* Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-261-0/+2
* Merge branch 'sh-project-feature-eager-load' into 'master'Yorick Peterse2017-09-211-1/+2
* Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-201-1/+1
* Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'Rémy Coutable2017-09-201-0/+6
* Merge branch 'rs-default-user-entity' into 'master'10-0-stable-prepare-rc4Stan Hu2017-09-171-1/+1
* Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-152-3/+28
* Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'10-0-stable-prepare-rc3Grzegorz Bizon2017-09-141-1/+1
* Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-th...Douwe Maan2017-09-141-1/+2
* Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-141-4/+10
* Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-141-0/+4
* Merge branch '37629-lazy-image-loading-breaks-notification-mails-for-an-added...Douwe Maan2017-09-142-1/+8
* Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-141-1/+0
* Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-143-0/+151
* Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan2017-09-082-11/+47
* 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
| * | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-062-0/+17
| |/
* | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
* | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-072-1/+3
|\ \
| * \ Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-077-5/+100
| |\ \
| * \ \ Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-076-7/+116
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-0628-266/+548
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0642-255/+1104
| |\ \ \ \
| * | | | | Incorporate reviewZeger-Jan van de Weg2017-09-041-1/+1
| * | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0449-96/+578
| |\ \ \ \ \
| * | | | | | Fix testsZeger-Jan van de Weg2017-09-042-1/+2
| * | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-311-1/+2
* | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-076-5/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-076-5/+6
* | | | | | | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-072-1/+85
|\ \ \ \ \ \ \
| * | | | | | | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-6/+4
| * | | | | | | Use indigo as default themeAnnabel Dunstone Gray2017-09-071-1/+1
| * | | | | | | Add previews in preferencesAnnabel Dunstone Gray2017-09-061-1/+1
| * | | | | | | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3