Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update `Gitlab.com?` to support stagingrs-gitalb-com-staging | Robert Speicher | 2016-06-27 | 2 | -1/+12 |
* | Merge branch 'regex-find-replace-http-matcher' into 'master' | Robert Speicher | 2016-06-27 | 67 | -1015/+1015 |
|\ | |||||
| * | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 67 | -1015/+1015 |
* | | Merge branch 'cherry-pick-5734e266' into 'master' | Robert Speicher | 2016-06-27 | 2 | -1/+9 |
|\ \ | |/ |/| | |||||
| * | Update CHANGELOG | Douwe Maan | 2016-06-27 | 1 | -0/+1 |
| * | Fix rendering of commit notes | Douwe Maan | 2016-06-27 | 1 | -1/+8 |
* | | Merge branch 'emoji-menu-stick-search' into 'master' | Jacob Schatz | 2016-06-27 | 6 | -19/+17 |
|\ \ | |/ |/| | |||||
| * | Updated award emoji testsemoji-menu-stick-search | Phil Hughes | 2016-06-24 | 1 | -3/+1 |
| * | Fixed award emoji tests | Phil Hughes | 2016-06-20 | 2 | -2/+1 |
| * | Made the search bar on emoji menu sticky | Phil Hughes | 2016-06-20 | 3 | -14/+15 |
* | | Merge branch 'update-omniauth-saml' into 'master' | Stan Hu | 2016-06-27 | 3 | -6/+8 |
|\ \ | |||||
| * | | Updated CHANGELOG | Patricio Cano | 2016-06-27 | 1 | -0/+3 |
| * | | Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-saml | Patricio Cano | 2016-06-27 | 2 | -6/+5 |
* | | | Merge branch 'mark-done-todo-id' into 'master' | Robert Speicher | 2016-06-27 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Correctly returns todo ID after creating todomark-done-todo-id | Phil Hughes | 2016-06-27 | 1 | -1/+2 |
* | | | | Merge branch '19075-new-wiki' into 'master' | Fatih Acet | 2016-06-27 | 2 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | Removed duplicate Changelog entries | Annabel Dunstone | 2016-06-27 | 1 | -12/+0 |
| * | | | | Add conditional for new pag link | Annabel Dunstone | 2016-06-27 | 1 | -0/+4 |
| * | | | | Update changelog | Annabel Dunstone | 2016-06-27 | 1 | -0/+13 |
| * | | | | Remove duplicate new page btn from edit wiki | Annabel Dunstone | 2016-06-27 | 1 | -3/+0 |
* | | | | | Merge branch 'workhorse-gmake' into 'master' | Stan Hu | 2016-06-27 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Mention gmake | Jacob Vosmaer | 2016-06-27 | 1 | -0/+4 |
* | | | | | | Merge branch 'new-branch-check-fix' into 'master' | Fatih Acet | 2016-06-27 | 2 | -1/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix check for existence of new branch button (!4630) | winniehell | 2016-06-27 | 2 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'revert-sri' into 'master' | Jacob Schatz | 2016-06-27 | 3 | -5/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Revert Subresource Integrity pending a fix for Firefox's incorrect hashing im...revert-sri | Connor Shea | 2016-06-27 | 3 | -5/+4 |
| |/ / / | |||||
* | | | | 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 | 95 | -292/+1546 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debug | James Lopez | 2016-06-27 | 1 | -2/+2 |
* | | | | | Merge branch 'image-sizing' into 'master' | Rémy Coutable | 2016-06-27 | 7 | -2/+19 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Wrap images in divs with Banzai and limit max-height.image-sizing | Connor Shea | 2016-06-27 | 7 | -2/+19 |
* | | | | | Merge branch 'test-gitlab-ci-ymls' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymls | Z.J. van de Weg | 2016-06-27 | 1 | -0/+12 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'fix-changelog-entries' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove duplicate changelog entryfix-changelog-entries | Robert Schilling | 2016-06-27 | 1 | -1/+0 |
* | | | | | | Merge branch 'case-insensitive-ci-skip' into 'master' | Rémy Coutable | 2016-06-27 | 4 | -4/+51 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add support for "skip ci" too | Simon Welsh | 2016-06-25 | 4 | -5/+36 |
| * | | | | | Allow "ci skip" to be in any case | Simon Welsh | 2016-06-25 | 4 | -3/+19 |
* | | | | | | Merge branch 'update-ee-downgrade-instructions' into 'master' | Achilleas Pipinellis | 2016-06-27 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update EE downgrade instructions to include JenkinsDeprecatedService | Stan Hu | 2016-06-24 | 1 | -2/+2 |
* | | | | | | | Merge branch 'remove-docs-for-gitlab-ci-service-api' into 'master' | Achilleas Pipinellis | 2016-06-27 | 1 | -34/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Remove docs for GitLab CI Service API | Takuya Noguchi | 2016-06-27 | 1 | -34/+0 |
* | | | | | | | Merge branch '2979-document-2fa-auth-changes' into 'master' | Achilleas Pipinellis | 2016-06-27 | 2 | -0/+18 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add notices about disabling auth features for users with 2FA.2979-document-2fa-auth-changes | Timothy Andrew | 2016-06-27 | 2 | -0/+18 |
* | | | | | | | Merge branch 'refactor/ci-config-add-entry-error' into 'master' | Rémy Coutable | 2016-06-27 | 18 | -65/+292 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-error | Grzegorz Bizon | 2016-06-20 | 211 | -745/+10821 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Extract CI entry config hash validation to validator | Grzegorz Bizon | 2016-06-17 | 3 | -7/+9 |
| * | | | | | | | | Merge branch 'master' into refactor/ci-config-add-entry-error | Grzegorz Bizon | 2016-06-17 | 238 | -1555/+11968 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add first custom validator for new ci config | Grzegorz Bizon | 2016-06-17 | 4 | -9/+21 |
| * | | | | | | | | | Rename legacy validation helpers for new ci config | Grzegorz Bizon | 2016-06-17 | 3 | -3/+3 |