summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed comit avatar alignmentcommit-avatar-alignmentPhil Hughes2016-06-272-9/+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
| * | | | | | | | Improve CI config entries validations prototypeGrzegorz Bizon2016-06-179-25/+144
| * | | | | | | | Add prototype of CI config node validatorGrzegorz Bizon2016-06-1612-101/+108
| * | | | | | | | Add class that encapsulates error in new Ci configGrzegorz Bizon2016-06-1512-8/+95
* | | | | | | | | Merge branch 'remove-unused-templates-from-gitlab-ci' into 'master' Rémy Coutable2016-06-276-65/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clean up some unused templates imported from GitLab CITakuya Noguchi2016-06-266-65/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'add-debugging-tips' into 'master' Achilleas Pipinellis2016-06-263-0/+263
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add debugging tips with gdbStan Hu2016-06-243-0/+263
* | | | | | | | | Merge branch 'patch-1' into 'master' Stan Hu2016-06-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed unneeded wordIan Lee2016-06-261-1/+1
* | | | | | | | | | Update CHANGELOG for 8.9.1Robert Speicher2016-06-251-12/+41
|/ / / / / / / / /
* | | | | | | | | Merge branch 'issue_19096' into 'master' Stan Hu2016-06-252-0/+47
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-242-0/+47
* | | | | | | | | Merge branch 'issue_15588' into 'master' Jacob Schatz2016-06-244-36/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add specs and improve coffescript sortable binding functionissue_15588Felipe Artur2016-06-245-41/+37
| * | | | | | | | | Fix issue being ordered twice and callback when moving between statesFelipe Artur2016-06-244-3/+9
* | | | | | | | | | Merge branch 'upgrade-sentry' into 'master' Robert Speicher2016-06-242-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Upgrade sentry-raven from 0.15.6 to 1.1.0.Connor Shea2016-06-242-3/+3
* | | | | | | | | | | Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-2428-28/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Appease Rubocop.js-content-forConnor Shea2016-06-231-1/+1
| * | | | | | | | | | | Trying to make this work with sprockets in production.Connor Shea2016-06-234-10/+8
| * | | | | | | | | | | Fix teaspoon tests.Connor Shea2016-06-234-5/+5
| * | | | | | | | | | | Readability.Connor Shea2016-06-231-1/+1
| * | | | | | | | | | | Add precompilation for relevant assets.Connor Shea2016-06-231-0/+2
| * | | | | | | | | | | Reorganize the lib directory.Connor Shea2016-06-2319-7/+4
| * | | | | | | | | | | Re-implement page-specific JS in a better way.Connor Shea2016-06-2310-16/+17