summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move profile notifications specs to separate filefix/ci-emails-broken-linkGrzegorz Bizon2016-02-122-98/+107
|
* Move build emails specs to separate fileGrzegorz Bizon2016-02-123-177/+186
| | | | | This also extracts shared examples for notification emails to separate file.
* Add Changelog entry for links fixes in build emailsGrzegorz Bizon2016-02-121-0/+1
|
* Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-124-46/+50
| | | | Closes #13199
* Merge branch 'workhorse-0.6.4' into 'master' Rémy Coutable2016-02-123-3/+3
|\ | | | | | | | | | | | | Use gitlab-workhorse 0.6.4 This fixes a bug in 8.5.0.rc1 where downloading Git blobs through the API is broken. See merge request !2794
| * Use gitlab-workhorse 0.6.4workhorse-0.6.4Jacob Vosmaer2016-02-123-3/+3
| |
* | Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' ↵Rémy Coutable2016-02-121-2/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide Needed because of !2782. See merge request !2796
| * | Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guideRémy Coutable2016-02-121-2/+12
| | | | | | | | | | | | | | | | | | Needed because of !2782. [ci skip]
* | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-124-12/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone order in project and issue edit lists to due_date _Originally opened at !2579 by @olirogers._ - - - This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001. This continues the work of !1934 to order milestones. I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome. See merge request !2780
| * | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-104-12/+10
| | |
* | | Merge branch 'typo_api_builds_doc' into 'master' Achilleas Pipinellis2016-02-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in doc/api/builds.md See merge request !2795
| * | | Fix typo in doc/api/builds.mdAchilleas Pipinellis2016-02-121-1/+1
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-1211-53/+89
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate email addresses using Devise.email_regexp Also: - Get rid of legacy `:strict_mode` - Get rid of custom `:email` validator - Add some shared examples to spec emails validation This supersedes !2754 and fixes #3851. See merge request !2771
| * | Re-add EmailValidator to avoid the repetition of format: { with: ↵streamline-email-validationRémy Coutable2016-02-095-6/+10
| | | | | | | | | | | | Devise.email_regexp }
| * | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-0911-58/+90
| | | | | | | | | | | | | | | | | | | | | Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
* | | 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
| | | | | | |
View Lorry Controller Status