summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable "Already Blocked" button in admin abuse report pageStan Hu2016-01-091-1/+1
|
* Merge branch 'doc_clean_up_add_users' into 'master' Achilleas Pipinellis2016-01-0914-13/+77
|\ | | | | | | | | | | | | Clean up document on adding users to a project Closes #3093, #3648 See merge request !2356
| * Clean up document on adding users to a projectAchilleas Pipinellis2016-01-0914-13/+77
|/ | | | [ci skip]
* Merge branch 'cross-project-reference-typo-fix' into 'master' Robert Speicher2016-01-081-1/+1
|\ | | | | | | | | changes verb `references` to noun `reference`. See merge request !2349
| * changes verb `references` to noun `reference`.cross-project-reference-typo-fixJacob Schatz2016-01-081-1/+1
| |
* | Remove Block Button from Abuse Reports page if User is Already Blocked Robert Speicher2016-01-081-1/+4
|\ \ | | | | | | | | | | | | | | | | | | An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292 Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667 See merge request !2313
| * | Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blockedKelvin2016-01-061-0/+3
| | |
| * | Remove block button on abuse reports if user is already blockedKelvin2016-01-061-1/+1
| | |
* | | Add a CHANGELOG entry for The Most Important Feature of All Time(TM)Robert Speicher2016-01-081-0/+2
| | | | | | | | | | | | | | | | | | Also, Open Graph data, if you're into that kind of thing. [ci skip]
* | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-0811-51/+94
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| * | | DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-085-37/+30
| | | |
| * | | Update specDouwe Maan2016-01-072-9/+12
| | | |
| * | | Satisfy RubocpDouwe Maan2016-01-071-1/+1
| | | |
| * | | Add API project upload endpointDouwe Maan2016-01-078-23/+70
| | | |
* | | | Merge branch 'blacklist-new' into 'master' Robert Speicher2016-01-081-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'new' as a reserved namespace name Closes #5930 See merge request !2344
| * | | | Blacklist 'new'blacklist-newRobert Schilling2016-01-081-0/+1
| | | | |
* | | | | Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-085-1/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress e-mails on failed builds if allow_failure is set Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`. @ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away. See merge request !2178
| * | | | Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-075-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
* | | | | Merge branch 'rs-single-item-task-list-spec' into 'master' Douwe Maan2016-01-081-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for single-item task lists Follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2330 See merge request !2340
| * | | | | Add spec for single-item task listsrs-single-item-task-list-specRobert Speicher2016-01-071-0/+6
| | | | | |
* | | | | | Merge branch 'issue_3076' into 'master' Drew Blessing2016-01-083-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problem with projects ending with .keys #3076 Closes #3076 Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys` See merge request !1883
| * | | | | | Fix problem with projects ending with .keys #3076Jose Corcuera2016-01-063-3/+5
| | | | | | |
* | | | | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-0819-97/+180
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project services and JIRA documentation clean up Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176 This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more. @Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well. @dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better. See merge request !2345
| * | | | | | | Add JIRA 7 to the supported versionsdocs_project_servicesAchilleas Pipinellis2016-01-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Remove useless assignment to variableAchilleas Pipinellis2016-01-081-1/+1
| | | | | | | |
| * | | | | | | Remove reference to EE from JIRA service modelAchilleas Pipinellis2016-01-081-5/+0
| | | | | | | |
| * | | | | | | Clean up the JIRA integration document [ci skip]Achilleas Pipinellis2016-01-089-52/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new images where needed - move images to a separate img directory - use table for the service fields - link to new documents
| * | | | | | | Split external issue tracker documentAchilleas Pipinellis2016-01-088-32/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Clean up integration READMEAchilleas Pipinellis2016-01-081-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'current-settings-handle-missing-db' into 'master' Yorick Peterse2016-01-081-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | See merge request !2346
| * | | | | | | | Handle missing DBs in connect_to_db?Yorick Peterse2016-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures CurrentSettings#connect_to_db? returns "false" in the event of a database not existing, instead of raising an error.
* | | | | | | | | Merge branch 'api-delete-tag' into 'master' Dmitriy Zaporozhets2016-01-084-0/+63
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete tag via API ### What does this MR do? Implements deleting a tag via the API. ### Are there points in the code the reviewer needs to double check? On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111). ### What are the relevant issue numbers / Feature requests? * This MR closes #1575 * Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api @stanhu Could you do a review? See merge request !1862
| * | | | | | | | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-084-0/+63
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' Dmitriy Zaporozhets2016-01-083-1/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept 2xx status codes for successful Web hook triggers Closes https://github.com/gitlabhq/gitlabhq/issues/9956 See merge request !2332
| * | | | | | | | | Accept 2xx status codes for successful Web hook triggersStan Hu2016-01-073-1/+14
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9956
* | | | | | | | | Merge branch 'sorting-dropdown-order' into 'master' Dmitriy Zaporozhets2016-01-081-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes titles Fixes #5909 See merge request !2334
| * | | | | | | | | changes titlessorting-dropdown-orderJacob Schatz2016-01-072-8/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'cross-project-reference-move' into 'master' Dmitriy Zaporozhets2016-01-082-10/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds reference to the bottom of sidebar Fixes #4183 ![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png) See merge request !2339
| * | | | | | | | | | adds 85% width for textcross-project-reference-moveJacob Schatz2016-01-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | adds reference to the bottom of sidebarJacob Schatz2016-01-072-10/+19
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'banner-out-of-place' into 'master' Dmitriy Zaporozhets2016-01-082-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | css change to height to make gray container fit Fixes #5893 ![Screen_Shot_2016-01-07_at_1.22.53_PM](/uploads/7bdd44a71d255fa1439e5b96af0bd48b/Screen_Shot_2016-01-07_at_1.22.53_PM.png) See merge request !2337
| * | | | | | | | | | css change to height to make gray container fitbanner-out-of-placeJacob Schatz2016-01-073-6/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-081-16/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project services to include all supported ones Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/80 See merge request !2297
| * | | | | | | | | | Update project services to include all supported onesAchilleas Pipinellis2016-01-051-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'rs-remove-stamp' into 'master' Dmitriy Zaporozhets2016-01-0826-38/+41
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove stamp gem Closes #5908 See merge request !2323
| * | | | | | | | | | Fix feature steprs-remove-stampRobert Speicher2016-01-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use `xmlschema` where even more appropriate!Robert Speicher2016-01-079-10/+10
| | | | | | | | | | |
| * | | | | | | | | | Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-0711-12/+12
| | | | | | | | | | |
| * | | | | | | | | | Add two custom Date/Time conversion formatsRobert Speicher2016-01-0711-18/+27
| | | | | | | | | | |
| * | | | | | | | | | Remove stamp gemRobert Speicher2016-01-0712-21/+15
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5908
View Lorry Controller Status