summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| | * | | | | | Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-212-10/+2
* | | | | | | | added nice to have - rake task and some changes to docsJames Lopez2016-06-211-0/+13
|/ / / / / / /
* | | | | | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-37/+14
|\ \ \ \ \ \ \
| * | | | | | | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-37/+14
* | | | | | | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-211-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-5/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'show-image-id-on-registry-page' into 'master' Rémy Coutable2016-06-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Show proper image ID on registry pageKamil Trzcinski2016-06-211-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | 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-2172-260/+2136
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-1063-504/+808
| |\ \ \ \ \ \ \
| * | | | | | | | WIPKamil Trzcinski2016-06-033-6/+8
* | | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2110-134/+209
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| * | | | | | | | | Incorporate reviewZ.J. van de Weg2016-06-204-11/+19
| * | | | | | | | | Run rake gitlab:update_templatesZ.J. van de Weg2016-06-201-1/+1
| * | | | | | | | | Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-201-1/+1
| * | | | | | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-205-47/+73
| * | | | | | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-209-134/+176
| | |_|_|/ / / / / | |/| | | | | | |