summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix specsfix-extra-new-line-crlfRémy Coutable2016-08-012-2/+2
* Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-014-2/+16
* Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-0112-236/+265
|\
| * squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-0112-236/+265
* | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-0119-29/+494
|\ \
| * | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-013-4/+24
| * | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-296-97/+108
| * | Incorporate feedbackZ.J. van de Weg2016-07-298-29/+45
| * | Add API support for environmentsZ.J. van de Weg2016-07-295-0/+313
| * | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-2914-28/+133
* | | Merge branch 'new-issue-button-outline' into 'master' Rémy Coutable2016-08-013-2/+3
|\ \ \
| * | | Make "New issue" button in Issue page less obtrusive (!5457)winniehell2016-07-303-2/+3
* | | | Merge branch 'document-yaml-colon' into 'master' Achilleas Pipinellis2016-08-011-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update README.mddocument-yaml-colonMark Pundsack2016-07-271-1/+1
| * | | Clarify CI script needing to quote colonsMark Pundsack2016-07-251-0/+2
* | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-08-011-0/+8
|\ \ \ \
| * | | | Update start-using-git.mdButch Anton2016-07-211-0/+8
* | | | | Merge branch 'clarify-backup-keep-time' into 'master' Achilleas Pipinellis2016-08-011-0/+7
|\ \ \ \ \
| * | | | | Clarify backup_keep_time config parameter with S3clarify-backup-keep-timeStan Hu2016-07-291-0/+7
* | | | | | Merge branch 'improve-test-specificity' into 'master' Stan Hu2016-08-011-1/+1
|\ \ \ \ \ \
| * | | | | | Improve spinach test to be more specific about link to clickStan Hu2016-07-311-1/+1
|/ / / / / /
* | | | | | Merge branch 'fix-invalid-x-forwarded-for-ip' into 'master' Stan Hu2016-08-013-0/+9
|\ \ \ \ \ \
| * | | | | | Moved to 8.10.3 release.lookatmike2016-07-311-1/+1
| * | | | | | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-313-0/+9
|/ / / / / /
* | | | | | Merge branch 'clarify-deletion-message' into 'master' Robert Speicher2016-07-301-1/+1
|\ \ \ \ \ \
| * | | | | | Clarify which project is deleted to avoid alarmclarify-deletion-messageStan Hu2016-07-291-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'reject-merge-conflicts' into 'master' Robert Speicher2016-07-303-1/+19
|\ \ \ \ \ \
| * | | | | | Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-293-1/+19
| |/ / / / /
* | | | | | Merge branch 'remove-redundant-blob-text-calls' into 'master' Yorick Peterse2016-07-305-6/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-295-6/+27
|/ / / / /
* | | | | Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-294-2/+22
|\ \ \ \ \
| * | | | | fix repo hooks missing on importfix/import-project-hooksJames Lopez2016-07-284-2/+22
* | | | | | Merge branch 'ability-batch-issue-checking' into 'master' Robert Speicher2016-07-298-10/+355
|\ \ \ \ \ \
| * | | | | | Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-298-10/+355
* | | | | | | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-2916-177/+184
|\ \ \ \ \ \ \
| * | | | | | | Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-194-10/+11
| * | | | | | | Fix method visiblity in emoji filter classGrzegorz Bizon2016-07-191-5/+5
| * | | | | | | Fix methods visibility in markdown filter classGrzegorz Bizon2016-07-191-7/+7
| * | | | | | | Fix method visibility in gitlab metrics classGrzegorz Bizon2016-07-191-2/+2
| * | | | | | | Make banzai module that handles markdown singletonGrzegorz Bizon2016-07-191-7/+9
| * | | | | | | Fix method visibility in inline diff classGrzegorz Bizon2016-07-191-35/+39
| * | | | | | | Fix methods visibility in gitlab database moduleGrzegorz Bizon2016-07-191-2/+4
| * | | | | | | Refactor gitlab themes module to make it singletonGrzegorz Bizon2016-07-191-7/+9
| * | | | | | | Refactor system notes service to make it singletonGrzegorz Bizon2016-07-191-76/+78
| * | | | | | | Fix private method visibility in container registryGrzegorz Bizon2016-07-191-6/+6
| * | | | | | | Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-194-20/+14
* | | | | | | | Merge branch 'refactor/ci-config-move-job-entries' into 'master' Rémy Coutable2016-07-2933-343/+1147
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve code, remove unused validator, improve namesGrzegorz Bizon2016-07-2911-36/+22
| * | | | | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-22233-2300/+3694
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move job dependencies entry to the new CI configGrzegorz Bizon2016-07-203-16/+14
View Lorry Controller Status