summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix 500 error when comparing by tags, issue 13171klowner/gitlab-ce-fix-compare-by-tag-crashMark Riedesel2016-02-111-0/+2
|
* Merge branch 'use-caching' into 'master' Kamil Trzciński2016-02-112-6/+52
|\ | | | | | | | | | | | | Use caching This enables to use built-in caching feature instead of using the `/cache` folder. See merge request !2747
| * Use caching, instead of haxxy /cacheuse-cachingKamil Trzcinski2016-02-102-6/+52
| |
* | Merge branch 'fix/ci-build-status-badge' into 'master' Kamil Trzciński2016-02-1111-40/+133
|\ \ | | | | | | | | | | | | | | | | | | Fix CI build status badge Closes #5570, #4935, #4163 See merge request !2704
| * | Parse XML instead of HTML in tests for a SVG build badgefix/ci-build-status-badgeGrzegorz Bizon2016-02-113-7/+7
| | |
| * | Move build badge specs to badges directoryGrzegorz Bizon2016-02-112-6/+3
| | |
| * | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-115-14/+19
| | |
| * | Add Changelog entry for changes in builds badgeGrzegorz Bizon2016-02-111-0/+1
| | |
| * | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-114-13/+7
| | |
| * | Fix rubocop offence in routes for build badgeGrzegorz Bizon2016-02-111-1/+1
| | |
| * | Add short builds badge documentationGrzegorz Bizon2016-02-111-0/+10
| | |
| * | Improve build badge tests, add another test caseGrzegorz Bizon2016-02-113-6/+19
| | |
| * | Add feature tests for builds status badgeGrzegorz Bizon2016-02-113-2/+52
| | |
| * | Add second build for each commit in build seedsGrzegorz Bizon2016-02-111-14/+25
| | |
| * | Respond to proper format for build badge requestGrzegorz Bizon2016-02-111-2/+8
| | |
| * | Move badge implementation to builds controllerGrzegorz Bizon2016-02-113-24/+13
| | |
| * | Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-112-2/+8
| | |
| * | Improve CI status badge implementationGrzegorz Bizon2016-02-113-17/+11
| | |
| * | Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-112-0/+13
| | |
| * | Render 404 if there is no project for old CI status badgeGrzegorz Bizon2016-02-111-0/+1
| | |
| * | Add deprecation warning for old CI status badge actionGrzegorz Bizon2016-02-111-1/+4
|/ / | | | | | | | | We keep this only for backwards compatibility with projects that have been migrated from GitLab CI. New project badge will go elsewhere.
* | Merge branch 'display-mr-link-if-thre-is-one' into 'master' Douglas Barbosa Alexandre2016-02-108-9/+122
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces "Create merge request" link with one to the MR when one exists Fixes #3716 * Without MR: ![before-1](/uploads/abcb2eb5bb5927a83c2f1700528f852c/before-1.png) * With MR: ![after-1](/uploads/9020b871e1aa08d3e5a45359336ef0f2/after-1.png) * Without MR: ![before-2](/uploads/bb3bd1a74efc193ad31af68f1e04ef5f/before-2.png) * With MR: ![after-2](/uploads/789d32aef12f39c605e665d0c4bc9fbe/after-2.png) * Without MR: ![before-3](/uploads/a9aff7a11eb1069be24c37a5455be809/before-3.png) * With MR: ![after-3](/uploads/48fe81ea50657fe5b2de0d25260d8e4b/after-3.png) See merge request !2670
| * | [ci skip] Update CHANGELOGDouglas Barbosa Alexandre2016-02-101-1/+1
| | |
| * | Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-oneDouglas Barbosa Alexandre2016-02-103-3/+3
| | |
| * | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-108-9/+122
| | |
* | | Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into ↵Robert Speicher2016-02-104-7/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add assignee data to Issuables' hook_data Originally opened at !1633 by @brammeleman. Fixes #3047. Fixes #2475. See merge request !2724
| * | | Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-104-7/+35
| | | |
* | | | Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master' Robert Speicher2016-02-103-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually use the `skip_merges` option in Repository#commits Originally opened at !2067 by @cwq1913. See merge request !2750
| * | | | Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commitsTony Chu2016-02-083-1/+9
| | | | |
* | | | | Add notice about MR target for stable fixesSytse Sijbrandij2016-02-101-0/+1
| |_|_|/ |/| | |
* | | | Merge branch 'fix/ci-api-builds-docs' into 'master' Achilleas Pipinellis2016-02-101-44/+24
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix builds API formatting This MR is fixing formatting for builds API documentation. See merge request !2775
| * | | Add some fixesfix/ci-api-builds-docsTomasz Maczukin2016-02-101-7/+7
| | | | | | | | | | | | | | | | [ci skip]
| * | | Fix builds API formattingTomasz Maczukin2016-02-101-42/+22
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis2016-02-106-20/+157
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on relative URL support closes #12773 See merge request !2770
| * | | Fix typos and grammarAchilleas Pipinellis2016-02-105-12/+14
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add note on using a custom init scriptdoc_relative_urlAchilleas Pipinellis2016-02-091-1/+5
| | | | | | | | | | | | | | | | [ci skip]
| * | | Edit configuration files for relative URL supportAchilleas Pipinellis2016-02-094-20/+23
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add relative URL documentationAchilleas Pipinellis2016-02-092-0/+128
| | | |
* | | | Merge branch 'update-install-documentation-8.5' into 'master' Yorick Peterse2016-02-102-2/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated install/update guides for 8.5 See merge request !2766
| * | | | Updated install/update guides for 8.5Yorick Peterse2016-02-102-2/+108
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-1014-50/+91
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * | | | Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-095-8/+8
| | | | |
| * | | | More specific selectorsJosh Frye2016-02-091-4/+4
| | | | |
| * | | | MR feedbackJosh Frye2016-02-095-12/+9
| | | | |
| * | | | Extract events rendering to own action.Josh Frye2016-02-096-17/+22
| | | | |
| * | | | Starred, All, and Trending on explore are paged also group projects. Need ↵Josh Frye2016-02-097-14/+55
| | | | | | | | | | | | | | | | | | | | ajax filter.
| * | | | JS FixesJosh Frye2016-02-092-14/+15
| | | | |
| * | | | Fix explore filter. Fixes #13182Josh Frye2016-02-093-24/+21
| | | | |
* | | | | Merge branch 'rs-issue-13254' into 'master' Robert Speicher2016-02-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure link for README blobs includes the full path Closes #13254 See merge request !2774
| * | | | | Ensure link for README blobs includes the full pathrs-issue-13254Robert Speicher2016-02-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | Closes #13254