summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0120-29/+0
* Merge branch 'fix-relative-root-emoji-support' into 'master' Stan Hu2016-07-011-1/+10
|\
| * Fix emoji paths in relative root configurationsStan Hu2016-07-011-1/+10
* | use has_many relationship with eventsJames Lopez2016-07-011-0/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-07-017-61/+100
|\ \ | |/
| * Import from Github using Personal Access Tokens.Eric K Idema2016-06-301-14/+31
| * Merge branch 'rubocop/enable-unneeded-capital-w-cop' into 'master' Robert Speicher2016-06-301-1/+1
| |\
| | * Enable Style/UnneededCapitalW Rubocop coprubocop/enable-unneeded-capital-w-copGrzegorz Bizon2016-06-301-1/+1
| * | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shardsAlejandro Rodríguez2016-06-291-0/+17
| * | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-292-41/+42
| |/
| * Handle case when Redis cache returns an empty settingStan Hu2016-06-291-1/+1
| * Fix database migrations when Redis is not runningStan Hu2016-06-291-3/+7
| * Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-292-2/+2
* | bump version - as old exports wont be compatibleJames Lopez2016-06-291-1/+1
* | fixing events for import/exportJames Lopez2016-06-291-5/+10
|/
* Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-0/+13
|\
| * Bump workhorse versionzj-workhorse-format-patchZ.J. van de Weg2016-06-281-4/+4
| * Workhorse to serve email diffsZ.J. van de Weg2016-06-281-0/+13
* | Use clock_gettime for all performance timestampsperformance-clock-adjustmentsYorick Peterse2016-06-284-19/+34
* | Unused got variable with very bad performancePaco Guzman2016-06-281-1/+0
* | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-271-3/+3
* | make #custom_language privatehttp://jneen.net/2016-06-271-8/+8
* | appease rubocophttp://jneen.net/2016-06-271-2/+1
* | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-272-6/+25
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/sidekiq-mem...James Lopez2016-06-2711-49/+150
|\
| * Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-279-45/+133
| |\
| | * Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-2033-85/+1240
| | |\
| | * | Extract CI entry config hash validation to validatorGrzegorz Bizon2016-06-172-7/+9
| | * | Merge branch 'master' into refactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-177-36/+28
| | |\ \
| | * | | Add first custom validator for new ci configGrzegorz Bizon2016-06-173-9/+21
| | * | | Rename legacy validation helpers for new ci configGrzegorz Bizon2016-06-172-2/+2
| | * | | Improve CI config entries validations prototypeGrzegorz Bizon2016-06-175-14/+17
| | * | | Add prototype of CI config node validatorGrzegorz Bizon2016-06-167-69/+98
| | * | | Add class that encapsulates error in new Ci configGrzegorz Bizon2016-06-156-5/+47
| * | | | Fix tmp file being deleted after the request plus some cleanup and improved e...James Lopez2016-06-242-4/+17
* | | | | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debugJames Lopez2016-06-271-2/+2
|/ / / /
* | | | Merge branch 'fix/import-export-gitlab-errors' into 'master' Rémy Coutable2016-06-231-1/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-06-231-1/+1
| |\ \ \ \
| * | | | | fix utc errorJames Lopez2016-06-221-1/+3
* | | | | | Add Sidekiq queue duration to transaction metrics.Paco Guzman2016-06-231-0/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'fix_saml_signin' into 'master' Robert Speicher2016-06-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix subsequent SAML sign insDrew Blessing2016-06-221-1/+1
* | | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-221-0/+2
|\ \ \ \ \
| * | | | | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-181-0/+2
* | | | | | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-213-6/+10
|\ \ \ \ \ \
| * | | | | | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-211-0/+2
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-2148-146/+1643
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-1026-131/+454
| |\ \ \ \ \ \
| * | | | | | | WIPKamil Trzcinski2016-06-033-6/+8
* | | | | | | | fixup! override content methodZ.J. van de Weg2016-06-202-15/+18
View Lorry Controller Status