summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'handle-redis-not-there' into 'master' Stan Hu2016-06-291-3/+7
|\
| * 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
* | Merge branch 'rs-gitalb-com-staging' into 'master' Robert Speicher2016-06-291-1/+6
|\ \ | |/ |/|
| * Update `Gitlab.com?` to support stagingrs-gitalb-com-stagingRobert Speicher2016-06-271-1/+6
* | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-293-3/+3
* | 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
| |/
* | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' Rémy Coutable2016-06-281-3/+3
|\ \
| * | Remove redundant check in commit builds API endpointfix/builds-api-builds-for-commit-searchGrzegorz Bizon2016-06-281-2/+0
| * | Improve commit builds API endpoint RESTful behaviorGrzegorz Bizon2016-06-281-1/+3
| * | Find all builds for commit if multiple pipelinesGrzegorz Bizon2016-06-281-3/+3
* | | 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
* | Rename Licenses API to License Templates APIDrew Blessing2016-06-272-3/+3
|/
* Merge branch 'fix/sidekiq-mem-killer-debug' into 'master' Rémy Coutable2016-06-271-2/+2
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/sidekiq-mem...James Lopez2016-06-2718-78/+374
| |\
| * | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debugJames Lopez2016-06-271-2/+2
* | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-271-1/+9
| |/ |/|
* | Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-2710-46/+134
|\ \
| * \ Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-2043-122/+1503
| |\ \
| * | | 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-1717-66/+155
| |\ \ \
| * | | | Add first custom validator for new ci configGrzegorz Bizon2016-06-173-9/+21
| * | | | Rename legacy validation helpers for new ci configGrzegorz Bizon2016-06-173-3/+3
| * | | | 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
* | | | | Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api'Rémy Coutable2016-06-241-0/+35
|\ \ \ \ \
| * | | | | gitlab-org/gitlab-ce#17818 - add api call for issues by groupMarc Siegfriedt2016-06-231-0/+35
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/gitlab-import-project-file-fix' into 'master' Rémy Coutable2016-06-242-4/+17
|\ \ \ \ \
| * | | | | Fix tmp file being deleted after the request plus some cleanup and improved e...James Lopez2016-06-242-4/+17
| |/ / / /
* | | | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-245-28/+188
|/ / / /
* | | | 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-233-4/+21
| |\ \ \ \
| * | | | | 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 'fix-external-issue-links' into 'master' Robert Speicher2016-06-221-3/+7
|\ \ \ \ \ \
| * | | | | | Handle external issues in IssueReferenceFilterfix-external-issue-linksYorick Peterse2016-06-211-3/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into feature/import-export-docsAchilleas Pipinellis2016-06-223-10/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-212-10/+2
| |\ \ \ \ \ \
View Lorry Controller Status