summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pipeline-hooks-without-slack' into 'master' Robert Speicher2016-08-1616-34/+99
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-1649-177/+699
| |\
| * | Revert unrelevant changespipeline-hooks-without-slackKamil Trzcinski2016-08-161-2/+3
| * | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-154-27/+50
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1518-37/+123
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1314-22/+94
| |\ \ \ \
| * | | | | Capitalise URL on web_hooks/formKamil Trzcinski2016-08-121-8/+8
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-125-23/+12
| |\ \ \ \ \
| * | | | | | Fix test failuresKamil Trzcinski2016-08-121-1/+1
| * | | | | | Make `execute_methods` publicKamil Trzcinski2016-08-121-2/+2
| * | | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1214-70/+161
| |\ \ \ \ \ \
| * | | | | | | Fix tests. We cannot reload unless it's already saved:Lin Jen-Shin2016-08-121-1/+4
| * | | | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-1210-20/+50
| * | | | | | | Fix tests for pipeline eventsKamil Trzcinski2016-08-111-1/+3
| * | | | | | | Fix pipeline status change from pending to runningKamil Trzcinski2016-08-112-1/+8
| * | | | | | | Remove stage parameter from send payloadKamil Trzcinski2016-08-111-0/+2
| * | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1128-388/+699
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-11144-924/+1024
| |\ \ \ \ \ \ \ \
| * | | | | | | | | No need to check that as in CreateCommitBuildsService:Lin Jen-Shin2016-08-051-1/+1
| * | | | | | | | | 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
| * | | | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-049-12/+13
| * | | | | | | | | 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-041-6/+4
| * | | | | | | | | Make sure we only fire hooks upon status changedLin Jen-Shin2016-08-031-3/+3
| * | | | | | | | | 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
| * | | | | | | | | Introduce execute_hooks_unless_ci_skippedLin Jen-Shin2016-08-031-3/+6
| * | | | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-029-10/+33
* | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' Jacob Schatz2016-08-162-5/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | 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-202-3/+9
* | | | | | | | | | Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-1612-35/+223
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-1612-35/+223
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-162-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-162-1/+6
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-152-1/+6
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-112-1/+6
* | | | | | | | | | | | | 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 failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-4/+4
* | | | | | | | | | | | | Move the "update" portion of the protected branch view into a partial.Timothy Andrew2016-08-162-10/+13
* | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-1610-55/+54
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-1517-68/+342
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Further refactor and syntax fixes.Patricio Cano2016-08-1512-133/+132
| * | | | | | | | | | | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-159-98/+180
| * | | | | | | | | | | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-157-6/+80
| * | | | | | | | | | | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-153-2/+18