summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | Remove stage parameter from send payloadKamil Trzcinski2016-08-113-5/+5
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-11102-2578/+3048
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-11591-5159/+8109
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Let's make sure cache were cleared:Lin Jen-Shin2016-08-051-0/+4
| | * | | | | | | | | | | | | | We still need to skip loading config_processor if skip_ci?Lin Jen-Shin2016-08-051-1/+1
| | * | | | | | | | | | | | | | No need to check that as in CreateCommitBuildsService:Lin Jen-Shin2016-08-051-1/+1
| | * | | | | | | | | | | | | | Define utility functions later, feedback:Lin Jen-Shin2016-08-051-10/+10
| | * | | | | | | | | | | | | | Share nothing so it's safest, feedback:Lin Jen-Shin2016-08-051-2/+5
| | * | | | | | | | | | | | | | Touch it after builds were created, aligning with:Lin Jen-Shin2016-08-051-1/+1
| | * | | | | | | | | | | | | | Removed the abstract let, feedback:Lin Jen-Shin2016-08-051-1/+0
| | * | | | | | | | | | | | | | Missed renaming themLin Jen-Shin2016-08-051-5/+7
| | * | | | | | | | | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-0428-44/+79
| | * | | | | | | | | | | | | | Separate the concern for executing hooks and updating statesLin Jen-Shin2016-08-041-4/+12
| | * | | | | | | | | | | | | | Revert "We don't have to touch it because builds would touch pipeline anyway"Lin Jen-Shin2016-08-042-0/+11
| | * | | | | | | | | | | | | | If we use Rails magic it's breaking this test:Lin Jen-Shin2016-08-042-7/+5
| | * | | | | | | | | | | | | | I was too used to this style...Lin Jen-Shin2016-08-041-1/+1
| | * | | | | | | | | | | | | | Test against the status in the payloadLin Jen-Shin2016-08-031-1/+9
| | * | | | | | | | | | | | | | Make sure we only fire hooks upon status changedLin Jen-Shin2016-08-032-4/+24
| | * | | | | | | | | | | | | | We don't have to touch it because builds would touch pipeline anywayLin Jen-Shin2016-08-032-11/+0
| | * | | | | | | | | | | | | | More descriptive comments, feedback:Lin Jen-Shin2016-08-031-2/+6
| | * | | | | | | | | | | | | | Use when instead of if, feedback:Lin Jen-Shin2016-08-031-4/+4
| | * | | | | | | | | | | | | | Introduce execute_hooks_unless_ci_skippedLin Jen-Shin2016-08-031-3/+6
| | * | | | | | | | | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-0219-18/+210
| * | | | | | | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' Jacob Schatz2016-08-164-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fixed wrapping of lines on smaller viewportsfile-content-highlight-linePhil Hughes2016-07-201-0/+3
| | * | | | | | | | | | | | | | Uses white-space instead of setting font size to 0Phil Hughes2016-07-201-5/+3
| | * | | | | | | | | | | | | | Highlight empty linesPhil Hughes2016-07-204-6/+12
| * | | | | | | | | | | | | | | Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-1633-106/+875
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-1633-106/+875
| | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'ee-581-backport-changes' into 'master' Douwe Maan2016-08-1621-109/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-1615-215/+229
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-1610-51/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-154-7/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | refactor parse_hash based on feedbackJames Lopez2016-08-111-3/+3
| | | * | | | | | | | | | | | | | | Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-114-7/+12
| | * | | | | | | | | | | | | | | | Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-156-44/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-116-44/+69
| | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge branch 'document-when-to-add-indexes' into 'master' Achilleas Pipinellis2016-08-162-0/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Added documentation on adding database indexesdocument-when-to-add-indexesYorick Peterse2016-08-112-0/+127
| * | | | | | | | | | | | | | | | | | Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-lin...Rubén Dávila Santos2016-08-162-159/+10
| * | | | | | | | | | | | | | | | | | Merge branch '19350-product-map' into 'master' Jacob Schatz2016-08-161-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Add reference to product map. 19350-product-mapChris Peressini2016-08-111-5/+11
| | |/ / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | Backport EE assertions in protected branch related specs.Timothy Andrew2016-08-162-10/+10
| | | | | * | | | | | | | | | | | | | Fix a missed `before_action` for `AutocompleteController`.Timothy Andrew2016-08-161-0/+1
| | | | | * | | | | | | | | | | | | | Backport `AutocompleteController#load_project` from EE!581.Timothy Andrew2016-08-161-5/+12
| | | | | * | | | | | | | | | | | | | Fix API::BranchesSpec.Timothy Andrew2016-08-161-1/+1
| | | | | * | | | | | | | | | | | | | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-164-20/+25
| | | | | * | | | | | | | | | | | | | Fix the protected branches factory.Timothy Andrew2016-08-161-3/+3
| | | | | * | | | | | | | | | | | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-163-7/+9
| | | | | * | | | | | | | | | | | | | Move the "update" portion of the protected branch view into a partial.Timothy Andrew2016-08-162-10/+13