| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into 4273-slash-commands | Douwe Maan | 2016-08-16 | 77 | -361/+1831 |
|\ |
|
| * | Merge branch 'pipeline-hooks-without-slack' into 'master'
| Robert Speicher | 2016-08-16 | 23 | -69/+227 |
| |\ |
|
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-... | Kamil Trzcinski | 2016-08-16 | 24 | -137/+745 |
| | |\ |
|
| | * | | Revert unrelevant changespipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-16 | 2 | -20/+15 |
| | * | | Make rubocop happy | Kamil Trzcinski | 2016-08-15 | 1 | -9/+9 |
| | * | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-15 | 12 | -84/+436 |
| | |\ \ |
|
| | * \ \ | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-15 | 19 | -75/+427 |
| | |\ \ \ |
|
| | * \ \ \ | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-13 | 6 | -24/+114 |
| | |\ \ \ \ |
|
| | * | | | | | Make explicit call for all event types for ProjectHook factory | Kamil Trzcinski | 2016-08-12 | 1 | -9/+7 |
| | * | | | | | Rename queue to enqueue in tests | Kamil Trzcinski | 2016-08-12 | 1 | -6/+6 |
| | * | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-12 | 2 | -6/+23 |
| | |\ \ \ \ \ |
|
| | * | | | | | | Fix test failures | Kamil Trzcinski | 2016-08-12 | 1 | -1/+1 |
| | * | | | | | | Make pipeline to be in created state for hooks tests | Kamil Trzcinski | 2016-08-12 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-12 | 10 | -115/+235 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Have trait all_events_enabled so that's easier to reuse, feedback: | Lin Jen-Shin | 2016-08-12 | 2 | -4/+15 |
| | * | | | | | | | Simplify the name for data builder, feedback: | Lin Jen-Shin | 2016-08-12 | 18 | -39/+31 |
| | * | | | | | | | Make it more grammatically correct, feedback: | Lin Jen-Shin | 2016-08-12 | 1 | -4/+4 |
| | * | | | | | | | if -> when; when -> `when`; %w() -> %w[]; and fix some typos: | Lin Jen-Shin | 2016-08-12 | 1 | -17/+17 |
| | * | | | | | | | Prefer described_class, feedback: | Lin Jen-Shin | 2016-08-12 | 3 | -3/+3 |
| | * | | | | | | | Make the comment more clear, feedback: | Lin Jen-Shin | 2016-08-12 | 1 | -1/+3 |
| | * | | | | | | | Fix tests for pipeline events | Kamil Trzcinski | 2016-08-11 | 1 | -17/+47 |
| | * | | | | | | | Fix pipeline status change from pending to running | Kamil Trzcinski | 2016-08-11 | 1 | -0/+45 |
| | * | | | | | | | Enhance a pipeline event tests to analyse number of returned builds | Kamil Trzcinski | 2016-08-11 | 2 | -22/+25 |
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-11 | 37 | -1085/+1481 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack | Lin Jen-Shin | 2016-08-11 | 248 | -1996/+3147 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Let's make sure cache were cleared: | Lin Jen-Shin | 2016-08-05 | 1 | -0/+4 |
| | * | | | | | | | | | Define utility functions later, feedback: | Lin Jen-Shin | 2016-08-05 | 1 | -10/+10 |
| | * | | | | | | | | | Removed the abstract let, feedback: | Lin Jen-Shin | 2016-08-05 | 1 | -1/+0 |
| | * | | | | | | | | | Missed renaming them | Lin Jen-Shin | 2016-08-05 | 1 | -5/+7 |
| | * | | | | | | | | | Move those builders to their own namespace, feedback: | Lin Jen-Shin | 2016-08-04 | 16 | -26/+54 |
| | * | | | | | | | | | If we use Rails magic it's breaking this test: | Lin Jen-Shin | 2016-08-04 | 1 | -1/+1 |
| | * | | | | | | | | | I was too used to this style... | Lin Jen-Shin | 2016-08-04 | 1 | -1/+1 |
| | * | | | | | | | | | Test against the status in the payload | Lin Jen-Shin | 2016-08-03 | 1 | -1/+9 |
| | * | | | | | | | | | Make sure we only fire hooks upon status changed | Lin Jen-Shin | 2016-08-03 | 1 | -1/+21 |
| | * | | | | | | | | | Use when instead of if, feedback: | Lin Jen-Shin | 2016-08-03 | 1 | -4/+4 |
| | * | | | | | | | | | Implement pipeline hooks, extracted from !5525 | Lin Jen-Shin | 2016-08-02 | 4 | -6/+72 |
| * | | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master'
| Jacob Schatz | 2016-08-16 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|
| | * | | | | | | | | | Highlight empty lines | Phil Hughes | 2016-07-20 | 2 | -3/+3 |
| * | | | | | | | | | | Merge branch 'issue_18656' into 'master'
| Douwe Maan | 2016-08-16 | 7 | -33/+392 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Load issues and merge requests templates from repository | Felipe Artur | 2016-08-16 | 7 | -33/+392 |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changes | Timothy Andrew | 2016-08-16 | 4 | -198/+66 |
| |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / |
|
| | * | | | | | | | | | | Merge remote-tracking branch 'dev/master' | Ruben Davila | 2016-08-16 | 3 | -39/+66 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'fix/export-att-inclusion' into 'master'
| Douwe Maan | 2016-08-15 | 2 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Fix attribute inclusion in import/export config ignored in some cases | James Lopez | 2016-08-11 | 2 | -1/+6 |
| | | * | | | | | | | | | | | Merge branch 'fix/import-permissions' into 'master'
| Douwe Maan | 2016-08-15 | 1 | -38/+60 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docs | James Lopez | 2016-08-11 | 1 | -38/+60 |
| | | | |/ / / / / / / / / / |
|
| | * | | | | | | | | | | | | Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-lin... | Rubén Dávila Santos | 2016-08-16 | 1 | -159/+0 |
| * | | | | | | | | | | | | | Backport EE assertions in protected branch related specs. | Timothy Andrew | 2016-08-16 | 2 | -10/+10 |
| * | | | | | | | | | | | | | Fix API::BranchesSpec. | Timothy Andrew | 2016-08-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Fix failing tests relating to backporting ee!581. | Timothy Andrew | 2016-08-16 | 2 | -4/+4 |