summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update `Gitlab.com?` to support stagingrs-gitalb-com-stagingRobert Speicher2016-06-272-1/+12
* Merge branch 'regex-find-replace-http-matcher' into 'master' Robert Speicher2016-06-2767-1015/+1015
|\
| * Use HTTP matchers if possibleZ.J. van de Weg2016-06-2767-1015/+1015
* | Merge branch 'cherry-pick-5734e266' into 'master' Robert Speicher2016-06-272-1/+9
|\ \ | |/ |/|
| * Update CHANGELOGDouwe Maan2016-06-271-0/+1
| * Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
* | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-276-19/+17
|\ \ | |/ |/|
| * Updated award emoji testsemoji-menu-stick-searchPhil Hughes2016-06-241-3/+1
| * Fixed award emoji testsPhil Hughes2016-06-202-2/+1
| * Made the search bar on emoji menu stickyPhil Hughes2016-06-203-14/+15
* | Merge branch 'update-omniauth-saml' into 'master' Stan Hu2016-06-273-6/+8
|\ \
| * | Updated CHANGELOGPatricio Cano2016-06-271-0/+3
| * | Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-samlPatricio Cano2016-06-272-6/+5
* | | Merge branch 'mark-done-todo-id' into 'master' Robert Speicher2016-06-271-1/+2
|\ \ \
| * | | Correctly returns todo ID after creating todomark-done-todo-idPhil Hughes2016-06-271-1/+2
* | | | Merge branch '19075-new-wiki' into 'master' Fatih Acet2016-06-272-3/+5
|\ \ \ \
| * | | | Removed duplicate Changelog entriesAnnabel Dunstone2016-06-271-12/+0
| * | | | Add conditional for new pag linkAnnabel Dunstone2016-06-271-0/+4
| * | | | Update changelogAnnabel Dunstone2016-06-271-0/+13
| * | | | Remove duplicate new page btn from edit wikiAnnabel Dunstone2016-06-271-3/+0
* | | | | Merge branch 'workhorse-gmake' into 'master' Stan Hu2016-06-271-0/+4
|\ \ \ \ \
| * | | | | Mention gmakeJacob Vosmaer2016-06-271-0/+4
* | | | | | Merge branch 'new-branch-check-fix' into 'master' Fatih Acet2016-06-272-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix check for existence of new branch button (!4630)winniehell2016-06-272-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'revert-sri' into 'master' Jacob Schatz2016-06-273-5/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert Subresource Integrity pending a fix for Firefox's incorrect hashing im...revert-sriConnor Shea2016-06-273-5/+4
| |/ / /
* | | | 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-2795-292/+1546
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debugJames Lopez2016-06-271-2/+2
* | | | | Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-277-2/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-277-2/+19
* | | | | Merge branch 'test-gitlab-ci-ymls' into 'master' Rémy Coutable2016-06-271-0/+12
|\ \ \ \ \
| * | | | | Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymlsZ.J. van de Weg2016-06-271-0/+12
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-changelog-entries' into 'master' Rémy Coutable2016-06-271-1/+0
|\ \ \ \ \
| * | | | | Remove duplicate changelog entryfix-changelog-entriesRobert Schilling2016-06-271-1/+0
* | | | | | Merge branch 'case-insensitive-ci-skip' into 'master' Rémy Coutable2016-06-274-4/+51
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add support for "skip ci" tooSimon Welsh2016-06-254-5/+36
| * | | | | Allow "ci skip" to be in any caseSimon Welsh2016-06-254-3/+19
* | | | | | Merge branch 'update-ee-downgrade-instructions' into 'master' Achilleas Pipinellis2016-06-271-2/+2
|\ \ \ \ \ \
| * | | | | | Update EE downgrade instructions to include JenkinsDeprecatedServiceStan Hu2016-06-241-2/+2
* | | | | | | Merge branch 'remove-docs-for-gitlab-ci-service-api' into 'master' Achilleas Pipinellis2016-06-271-34/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove docs for GitLab CI Service APITakuya Noguchi2016-06-271-34/+0
* | | | | | | Merge branch '2979-document-2fa-auth-changes' into 'master' Achilleas Pipinellis2016-06-272-0/+18
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add notices about disabling auth features for users with 2FA.2979-document-2fa-auth-changesTimothy Andrew2016-06-272-0/+18
* | | | | | | Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-2718-65/+292
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-20211-745/+10821
| |\ \ \ \ \ \ \
| * | | | | | | | Extract CI entry config hash validation to validatorGrzegorz Bizon2016-06-173-7/+9
| * | | | | | | | Merge branch 'master' into refactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-17238-1555/+11968
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add first custom validator for new ci configGrzegorz Bizon2016-06-174-9/+21
| * | | | | | | | | Rename legacy validation helpers for new ci configGrzegorz Bizon2016-06-173-3/+3