summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-1712-35/+79
|\
| * Add hover state to todos (!5361)winniehell2016-08-161-7/+8
| * Merge branch 'pipeline-hooks-without-slack' into 'master' Robert Speicher2016-08-162-8/+15
| |\
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-169-21/+62
| | |\
| | * \ Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-152-24/+28
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-153-5/+26
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-136-12/+22
| | |\ \ \ \
| | * | | | | Capitalise URL on web_hooks/formKamil Trzcinski2016-08-121-8/+8
| | * | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-123-5/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-112-3/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1145-189/+221
| | |\ \ \ \ \ \ \
| | * | | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-022-1/+8
| * | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' Jacob Schatz2016-08-161-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Highlight empty linesPhil Hughes2016-07-201-1/+1
| * | | | | | | | | Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-162-2/+24
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-162-2/+24
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-151-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-111-1/+1
| * | | | | | | | | | | | 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-162-10/+11
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-152-2/+12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Further refactor and syntax fixes.Patricio Cano2016-08-151-7/+5
| | * | | | | | | | | | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-152-3/+10
| | * | | | | | | | | | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-0/+5
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-156-31/+61
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-151-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Prevents accidental overwrites of commits from UIFrank West2016-08-151-2/+7
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-152-24/+28
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Render collection of badges instead of using iteratorGrzegorz Bizon2016-08-153-29/+28
| | * | | | | | | | | Extract pipeline badges to the separate view partialGrzegorz Bizon2016-08-152-28/+29
| | * | | | | | | | | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-151-24/+28
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-151-0/+13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-121-3/+6
| | * | | | | | | | | CI build status not per environmentZ.J. van de Weg2016-08-111-19/+17
| | * | | | | | | | | Tests for release status heading on MR#showZ.J. van de Weg2016-08-111-2/+2
| | * | | | | | | | | Show deployment status on a MR viewZ.J. van de Weg2016-08-111-14/+26
| * | | | | | | | | | Limit the size of SVGs when viewing them as blobssvg-render-size-limitYorick Peterse2016-08-151-5/+11
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add archived badge to project listingDrew Blessing2016-08-121-0/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Fix hard coded plural text.Fatih Acet2016-08-131-1/+1
* | | | | | | | | Disable commit button if commit message textarea empty.Fatih Acet2016-08-121-3/+2
* | | | | | | | | Remove commit button loader and update title while committing.Fatih Acet2016-08-121-1/+1
* | | | | | | | | Fix bug where merge widget wouldn't show up after resolving conflictsDouwe Maan2016-08-121-2/+8
* | | | | | | | | Minor code style tweaks in viewsDouwe Maan2016-08-122-12/+12
* | | | | | | | | “Showing N conflicts for A into B” -> “Showing N conflicts between A an...Douwe Maan2016-08-121-2/+2
* | | | | | | | | Use a regular flash message after resolution is completeDouwe Maan2016-08-121-6/+0
* | | | | | | | | Prevent “This merge request contains merge conflicts” from being shown af...Douwe Maan2016-08-122-2/+2
* | | | | | | | | Don’t hardcode pathsDouwe Maan2016-08-122-4/+3
* | | | | | | | | Show tooltip when conflicts cannot be resolved through GitLabDouwe Maan2016-08-121-1/+7