Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into mc-ui | Sean McGivern | 2016-08-17 | 12 | -35/+79 |
|\ | |||||
| * | Add hover state to todos (!5361) | winniehell | 2016-08-16 | 1 | -7/+8 |
| * | Merge branch 'pipeline-hooks-without-slack' into 'master' | Robert Speicher | 2016-08-16 | 2 | -8/+15 |
| |\ | |||||
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-... | Kamil Trzcinski | 2016-08-16 | 9 | -21/+62 |
| | |\ | |||||
| | * \ | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-15 | 2 | -24/+28 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-15 | 3 | -5/+26 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-13 | 6 | -12/+22 |
| | |\ \ \ \ | |||||
| | * | | | | | Capitalise URL on web_hooks/form | Kamil Trzcinski | 2016-08-12 | 1 | -8/+8 |
| | * | | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-12 | 3 | -5/+5 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack | Kamil Trzcinski | 2016-08-11 | 2 | -3/+3 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack | Lin Jen-Shin | 2016-08-11 | 45 | -189/+221 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Implement pipeline hooks, extracted from !5525 | Lin Jen-Shin | 2016-08-02 | 2 | -1/+8 |
| * | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' | Jacob Schatz | 2016-08-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Highlight empty lines | Phil Hughes | 2016-07-20 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'issue_18656' into 'master' | Douwe Maan | 2016-08-16 | 2 | -2/+24 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Load issues and merge requests templates from repository | Felipe Artur | 2016-08-16 | 2 | -2/+24 |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changes | Timothy Andrew | 2016-08-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'dev/master' | Ruben Davila | 2016-08-16 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'fix/import-permissions' into 'master' | Douwe Maan | 2016-08-15 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docs | James Lopez | 2016-08-11 | 1 | -1/+1 |
| * | | | | | | | | | | | | Move the "update" portion of the protected branch view into a partial. | Timothy Andrew | 2016-08-16 | 2 | -10/+13 |
| * | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!581 to CE. | Timothy Andrew | 2016-08-16 | 2 | -10/+11 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'akismet-submittable' into 'master' | Robert Speicher | 2016-08-15 | 2 | -2/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Further refactor and syntax fixes. | Patricio Cano | 2016-08-15 | 1 | -7/+5 |
| | * | | | | | | | | | | | Allow `Issue` to be submitted as spam | Patricio Cano | 2016-08-15 | 2 | -3/+10 |
| | * | | | | | | | | | | | Allow `SpamLog` to be submitted as ham | Patricio Cano | 2016-08-15 | 1 | -0/+5 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' into mc-ui | Douwe Maan | 2016-08-15 | 6 | -31/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits' | Douwe Maan | 2016-08-15 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Prevents accidental overwrites of commits from UI | Frank West | 2016-08-15 | 1 | -2/+7 |
| | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'feature/test-coverage-badge' into 'master' | Douwe Maan | 2016-08-15 | 2 | -24/+28 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Render collection of badges instead of using iterator | Grzegorz Bizon | 2016-08-15 | 3 | -29/+28 |
| | * | | | | | | | | | Extract pipeline badges to the separate view partial | Grzegorz Bizon | 2016-08-15 | 2 | -28/+29 |
| | * | | | | | | | | | Expose coverage report badge in pipeline settings | Grzegorz Bizon | 2016-08-15 | 1 | -24/+28 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'zj-deployment-status-on-mr' into 'master' | Douwe Maan | 2016-08-15 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Method names changed to #includes_commit?zj-deployment-status-on-mr | Z.J. van de Weg | 2016-08-12 | 1 | -3/+6 |
| | * | | | | | | | | | CI build status not per environment | Z.J. van de Weg | 2016-08-11 | 1 | -19/+17 |
| | * | | | | | | | | | Tests for release status heading on MR#show | Z.J. van de Weg | 2016-08-11 | 1 | -2/+2 |
| | * | | | | | | | | | Show deployment status on a MR view | Z.J. van de Weg | 2016-08-11 | 1 | -14/+26 |
| * | | | | | | | | | | Limit the size of SVGs when viewing them as blobssvg-render-size-limit | Yorick Peterse | 2016-08-15 | 1 | -5/+11 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Add archived badge to project listing | Drew Blessing | 2016-08-12 | 1 | -0/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Fix hard coded plural text. | Fatih Acet | 2016-08-13 | 1 | -1/+1 |
* | | | | | | | | | Disable commit button if commit message textarea empty. | Fatih Acet | 2016-08-12 | 1 | -3/+2 |
* | | | | | | | | | Remove commit button loader and update title while committing. | Fatih Acet | 2016-08-12 | 1 | -1/+1 |
* | | | | | | | | | Fix bug where merge widget wouldn't show up after resolving conflicts | Douwe Maan | 2016-08-12 | 1 | -2/+8 |
* | | | | | | | | | Minor code style tweaks in views | Douwe Maan | 2016-08-12 | 2 | -12/+12 |
* | | | | | | | | | “Showing N conflicts for A into B” -> “Showing N conflicts between A an... | Douwe Maan | 2016-08-12 | 1 | -2/+2 |
* | | | | | | | | | Use a regular flash message after resolution is complete | Douwe Maan | 2016-08-12 | 1 | -6/+0 |
* | | | | | | | | | Prevent “This merge request contains merge conflicts” from being shown af... | Douwe Maan | 2016-08-12 | 2 | -2/+2 |
* | | | | | | | | | Don’t hardcode paths | Douwe Maan | 2016-08-12 | 2 | -4/+3 |
* | | | | | | | | | Show tooltip when conflicts cannot be resolved through GitLab | Douwe Maan | 2016-08-12 | 1 | -1/+7 |