summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-15320-2482/+4551
|\
| * Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-1419-113/+70
| |\ | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * Make Mentionable#cross_reference_exists? private.simplify-cross-referencesDouwe Maan2015-10-142-13/+6
| | |
| | * Shut up, RubocopRobert Speicher2015-10-141-1/+1
| | |
| | * Use `to_reference` where possible.Douwe Maan2015-10-131-2/+2
| | |
| | * Fix mentionable specsDouwe Maan2015-10-124-7/+6
| | |
| | * Remove useless assignmentDouwe Maan2015-10-121-1/+1
| | |
| | * Chaining ftwDouwe Maan2015-10-121-5/+1
| | |
| | * Fix cross-references originating from notesDouwe Maan2015-10-124-20/+7
| | |
| | * Simplify code around (cross)-referencesDouwe Maan2015-10-1214-76/+58
| | |
| * | Merge branch 'show_pending_warning' into 'master' Kamil Trzciński2015-10-1415-24/+257
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show warning when build is pending and there are not runners This change is based on: !1530. This resolves #2967. See merge request !1573
| | * | Fix warning signshow_pending_warningKamil Trzcinski2015-10-143-6/+5
| | | |
| | * | Fix specsKamil Trzcinski2015-10-141-1/+1
| | | |
| | * | Show warning if build doesn't have runners with specified tags or runners ↵Kamil Trzcinski2015-10-1414-22/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | didn't connect recently Slightly refactor runner status detection: moving it to Runner class Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
| * | | Merge branch 'predefined_build_variables' into 'master' Kamil Trzciński2015-10-145-19/+70
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a few predefined variables to CI builds This adds CI_BUILD_TAG, CI_BUILD_STAGE, CI_BUILD_NAME and CI_BUILD_TRIGGERED to build environment. This change is based on: !1530 See merge request !1572
| | * | | Use tag? instead of tag to indicate that this is booleanpredefined_build_variablesKamil Trzcinski2015-10-141-1/+1
| | | | |
| | * | | Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI buildsKamil Trzcinski2015-10-145-19/+70
| | |/ /
| * | | Merge branch 'uploads_path_fix' into 'master' Valery Sizov2015-10-1417-10/+225
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Images cannot show when projects' path was changed Fixes #1443 See merge request !1521
| | * | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-1417-10/+225
| | | | |
| * | | | Merge branch 'revert_service_passwd' into 'master' Valery Sizov2015-10-146-78/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Improve invalidation of stored service password if the endpoint URL is changed" This reverts commit b46397548056e4e8ef00efe4f641c61ba1dd5230. See merge request !1595
| | * | | | Revert "Improve invalidation of stored service password if the endpoint URL ↵Valery Sizov2015-10-146-78/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | is changed" This reverts commit b46397548056e4e8ef00efe4f641c61ba1dd5230.
| * | | | Merge branch 'fix/improve_reset_service_password' into 'master' Valery Sizov2015-10-146-13/+78
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve invalidation of stored service password if the endpoint URL is changed A number of issues were found in !1490 and !1558 (triggered by support request 7395) * It is not possible to set a new URL and a password at the same time (new password is ignored) * An error occurs on the Service Templates admin pages (prop_updated? was referencing the service's project, which is not defined for templates) * Passwords are reset on every save in Service Templates admin pages This should fix these 3 issues by respectively: * Differentiating a property that has been assigned a new value (regardless of the new value) and a property that has been assigned a new value that is different from the old one * Providing an alternate implementation to detected updated properties, not relying on the service's project * Filtering an empty password parameter passed to the Service Templates admin page like on the project service page See merge request !1583
| | * | | Improve invalidation of stored service password if the endpoint URL is changedAlex Lossent2015-10-146-13/+78
| | | | | | | | | | | | | | | | | | | | | | | | | It now allows to specify a password at the same time as the new URL, and works on the service template admin pages.
| * | | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-145-3/+53
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-145-3/+53
| | |\ \ \
| | | * | | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-125-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface
| * | | | | Fix spinach tests introduced by 07101cfab61f28c6328efebea98f018ab8356cddKamil Trzcinski2015-10-142-8/+8
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-1415-24/+21
| |\ \ \ \ \
| | * | | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-1315-24/+21
| | | | | | |
| * | | | | | Merge branch 'fix-retry-and-cancel' into 'master' Kamil Trzciński2015-10-144-15/+27
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix retry and cancel for build This fixes some regressions introduced by Commit Status API See merge request !1586
| | * | | | | Fix retry and cancel for buildfix-retry-and-cancelKamil Trzcinski2015-10-144-15/+27
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'fix_issue_2906' into 'master' Douwe Maan2015-10-142-2/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + and Titleize New Project button on dashboard Hello there. Its my first merge request in open source world. So please be tolerant to me if i do something wrong. I try to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/2906 See merge request !1564
| | * | | | Use css styleЧингиз Ауанасов2015-10-132-2/+4
| | | | | |
| | * | | | + and Titleize New Project button on dashboardЧингиз Ауанасов2015-10-102-2/+2
| | | | | |
| * | | | | Merge branch 'mailroom-arbitration' into 'master' Robert Speicher2015-10-134-8/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable arbitration in MailRoom Fixes #2870. See merge request !1566
| | * | | | | Remove warning about Reply by email and HAmailroom-arbitrationDouwe Maan2015-10-121-4/+0
| | | | | | |
| | * | | | | Enable arbitration in MailRoomDouwe Maan2015-10-114-4/+44
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab'Dmitriy Zaporozhets2015-10-132-0/+2
| |\ \ \ \ \
| | * | | | | Add "New Page" button to Wiki Pages tabStan Hu2015-10-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2998
| * | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-10-136-5/+22
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #9723 from sue445/tweak_api_docStan Hu2015-10-132-1/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Tweak api doc
| | | * | | | | | [ci skip] Add missing parameters in API docsue4452015-10-141-0/+2
| | | | | | | | |
| | | * | | | | | [ci skip] Fix wrong commentsue4452015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`)
| | * | | | | | | Merge branch 'add-wip-to-mr-hook-attrs' into 'master' Stan Hu2015-10-134-4/+19
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request: add work_in_progress to MR hooks See merge request !1443
| | | * | | | | | | merge_request: add work_in_progress to MR hooksBen Boeckel2015-10-084-3/+18
| | | | | | | | | |
| | | * | | | | | | merge_request: coerce work_in_progress? into a booleanBen Boeckel2015-10-081-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'gfm-commit-size'Dmitriy Zaporozhets2015-10-131-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Reduce font size of commit references to not stand out as muchgfm-commit-sizeDouwe Maan2015-10-131-0/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'redesign-files-page'Dmitriy Zaporozhets2015-10-1312-88/+87
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Apply new design to files pageDmitriy Zaporozhets2015-10-1312-88/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status