Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/sidekiq-mem-killer-debug' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/sidekiq-mem... | James Lopez | 2016-06-27 | 18 | -78/+374 |
| |\ | |||||
| * | | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debug | James Lopez | 2016-06-27 | 1 | -2/+2 |
* | | | Wrap images in divs with Banzai and limit max-height.image-sizing | Connor Shea | 2016-06-27 | 1 | -1/+9 |
| |/ |/| | |||||
* | | Merge branch 'refactor/ci-config-add-entry-error' into 'master' | Rémy Coutable | 2016-06-27 | 10 | -46/+134 |
|\ \ | |||||
| * \ | Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-error | Grzegorz Bizon | 2016-06-20 | 43 | -122/+1503 |
| |\ \ | |||||
| * | | | Extract CI entry config hash validation to validator | Grzegorz Bizon | 2016-06-17 | 2 | -7/+9 |
| * | | | Merge branch 'master' into refactor/ci-config-add-entry-error | Grzegorz Bizon | 2016-06-17 | 17 | -66/+155 |
| |\ \ \ | |||||
| * | | | | Add first custom validator for new ci config | Grzegorz Bizon | 2016-06-17 | 3 | -9/+21 |
| * | | | | Rename legacy validation helpers for new ci config | Grzegorz Bizon | 2016-06-17 | 3 | -3/+3 |
| * | | | | Improve CI config entries validations prototype | Grzegorz Bizon | 2016-06-17 | 5 | -14/+17 |
| * | | | | Add prototype of CI config node validator | Grzegorz Bizon | 2016-06-16 | 7 | -69/+98 |
| * | | | | Add class that encapsulates error in new Ci config | Grzegorz Bizon | 2016-06-15 | 6 | -5/+47 |
* | | | | | Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api' | Rémy Coutable | 2016-06-24 | 1 | -0/+35 |
|\ \ \ \ \ | |||||
| * | | | | | gitlab-org/gitlab-ce#17818 - add api call for issues by group | Marc Siegfriedt | 2016-06-23 | 1 | -0/+35 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix/gitlab-import-project-file-fix' into 'master' | Rémy Coutable | 2016-06-24 | 2 | -4/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Fix tmp file being deleted after the request plus some cleanup and improved e... | James Lopez | 2016-06-24 | 2 | -4/+17 |
| |/ / / / | |||||
* | | | | | Support for rendering/redacting multiple documents | Yorick Peterse | 2016-06-24 | 5 | -28/+188 |
|/ / / / | |||||
* | | | | Merge branch 'fix/import-export-gitlab-errors' into 'master' | Rémy Coutable | 2016-06-23 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo... | James Lopez | 2016-06-23 | 3 | -4/+21 |
| |\ \ \ \ | |||||
| * | | | | | fix utc error | James Lopez | 2016-06-22 | 1 | -1/+3 |
* | | | | | | Add Sidekiq queue duration to transaction metrics. | Paco Guzman | 2016-06-23 | 1 | -0/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'fix_saml_signin' into 'master' | Robert Speicher | 2016-06-22 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix subsequent SAML sign ins | Drew Blessing | 2016-06-22 | 1 | -1/+1 |
* | | | | | | Merge branch 'fix-external-issue-links' into 'master' | Robert Speicher | 2016-06-22 | 1 | -3/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Handle external issues in IssueReferenceFilterfix-external-issue-links | Yorick Peterse | 2016-06-21 | 1 | -3/+7 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'master' into feature/import-export-docs | Achilleas Pipinellis | 2016-06-22 | 3 | -10/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe... | Douwe Maan | 2016-06-22 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t... | Rémy Coutable | 2016-06-18 | 1 | -0/+2 |
| * | | | | | | Merge branch 'remove-banzai-pre-process' into 'master' | Robert Speicher | 2016-06-21 | 2 | -10/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Move pre_process into render_resultremove-banzai-pre-process | Yorick Peterse | 2016-06-21 | 2 | -10/+2 |
* | | | | | | | | added nice to have - rake task and some changes to docs | James Lopez | 2016-06-21 | 1 | -0/+13 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' | Yorick Peterse | 2016-06-21 | 1 | -37/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Optimize Banzai::Filter::RelativeLinkFilter | Alejandro Rodríguez | 2016-06-21 | 1 | -37/+14 |
* | | | | | | | | Merge branch 'fix/builds-api-nil-commit' into 'master' | Rémy Coutable | 2016-06-21 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix builds API response not including commit data | Grzegorz Bizon | 2016-06-21 | 1 | -5/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'show-image-id-on-registry-page' into 'master' | Rémy Coutable | 2016-06-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show proper image ID on registry page | Kamil Trzcinski | 2016-06-21 | 1 | -0/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ci-lfs-fetch' into 'master' | Rémy Coutable | 2016-06-21 | 3 | -6/+10 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add test coverage to LFS fetchingci-lfs-fetch | Kamil Trzcinski | 2016-06-21 | 1 | -0/+2 |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetch | Kamil Trzcinski | 2016-06-21 | 72 | -260/+2136 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetch | Kamil Trzcinski | 2016-06-10 | 63 | -504/+808 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | WIP | Kamil Trzcinski | 2016-06-03 | 3 | -6/+8 |
* | | | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' | Jacob Schatz | 2016-06-21 | 10 | -134/+209 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fixup! override content method | Z.J. van de Weg | 2016-06-20 | 4 | -21/+20 |
| * | | | | | | | | | Incorporate review | Z.J. van de Weg | 2016-06-20 | 4 | -11/+19 |
| * | | | | | | | | | Run rake gitlab:update_templates | Z.J. van de Weg | 2016-06-20 | 1 | -1/+1 |
| * | | | | | | | | | Add changelog item, fix rubocop issue | Z.J. van de Weg | 2016-06-20 | 1 | -1/+1 |
| * | | | | | | | | | Implement backend gitlab ci dropdown | Z.J. van de Weg | 2016-06-20 | 5 | -47/+73 |
| * | | | | | | | | | Refactor Gitlab::Gitignores | ZJ van de Weg | 2016-06-20 | 9 | -134/+176 |
| | |_|_|/ / / / / | |/| | | | | | | |