summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use gitlab-workhorse 0.6.4workhorse-0.6.4Jacob Vosmaer2016-02-123-3/+3
|
* Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵Douwe Maan2016-02-124-5/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755
| * Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestoneRémy Coutable2016-02-091-3/+12
| |
| * API: Allow to set or update a merge-request's milestoneKirill Skachkov2016-02-083-2/+7
| |
* | Merge branch 'issue_13369' into 'master' Robert Speicher2016-02-121-8/+9
|\ \ | | | | | | | | | | | | | | | | | | Don't show fork button if user can't fork the project. Fixes #13369 See merge request !2793
| * | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
| | |
* | | Merge branch 'issue_13365' into 'master' Robert Speicher2016-02-121-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Load all blob data when highlighting content for git-blame. Fixes #13365 See merge request !2792
| * | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
|/ /
* | Merge branch 'fix_markdown_image_link' into 'master' Achilleas Pipinellis2016-02-112-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new image in the markdown help page Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. Fixes #13233 See merge request !2790
| * | Add a new image in the markdown help pageAchilleas Pipinellis2016-02-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. [ci skip]
* | | Merge branch 'remove_sqlite_check' into 'master' Jeroen van Baarsen2016-02-111-18/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove sqlite check in raketask This is a relic from 4 major releases ago. Time to remove it. See merge request !2777
| * | | Remove sqlite check in raketaskremove_sqlite_checkAchilleas Pipinellis2016-02-101-18/+0
| | | |
* | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed "Docker Fundamentals" link in GitLab Documentation. I noticed that the *Docker Fundamentals* link in the *Using Docker Images* part of the GitLab Documentation is broken. Screenshot: ![broken-link](/uploads/8d2fc782b2f5d4f3316a631f801cd3c7/broken-link.png) Changing it to "https://docs.docker.com/" should fix the problem. See merge request !2786
| * | | | Updated Docker Fundamentals link as suggested by @axilDenis Meiswinkel2016-02-111-1/+1
| | | | |
| * | | | Fixed "Docker Fundamentals" link.Denis Meiswinkel2016-02-111-1/+1
| | | | |
* | | | | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵Rémy Coutable2016-02-114-0/+98
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add merge_requests/:merge_request_id/closes_issues _Originally opened at !2660 by @Schniz._ - - - Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully See merge request !2779
| * | | | Pass current_user to merge_request.closes_issues in API ans streamline MR ↵Schniz/gitlab-ce-feature/merge-request-closes-issues-in-apiRémy Coutable2016-02-113-19/+9
| | | | | | | | | | | | | | | | | | | | API specs
| * | | | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵Gal Schlezinger2016-02-115-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route in the API Added some documentation for it Added to changelog Added curl example and an attribute table Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb" Fixed the attributes and changed the documentation to be at "merge_requests.md" too Changed generic titles to more specific titles added an underscore added tests. it depends on a newer version of gitlab-test project I'm doing a since I need to add a branch to the `gitlab-test` repo removed the before using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass Removed the 'closes-issues' key from test_env. so it should pass the tests Moved the two initializations to the describe block Changed the changelog
* | | | | 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]
View Lorry Controller Status