summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* address commentsupdate_passwd_serviceValery Sizov2015-10-153-5/+43
|
* Invalidate stored service password if the endpoint URL is changed. STEP 2Valery Sizov2015-10-146-7/+29
|
* 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>
* | | | | | | | | Merge branch 'group_names_widget' into 'master' Dmitriy Zaporozhets2015-10-134-3/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project names are not fully shown if group name is too big, even on group page view https://dev.gitlab.org/gitlab/gitlabhq/issues/2548 ![joxi_screenshot_1444408109183](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c21ae245254b82db0212298b6f997067/joxi_screenshot_1444408109183.png) See merge request !1561
| * | | | | | | | Project names are not fully shown if group name is too big, even on group ↵group_names_widgetValery Sizov2015-10-134-3/+6
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | page view
* | | | | | | | Merge branch 'commit_status' into 'master' Kamil Trzciński2015-10-1335-343/+887
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Commit Status API This is preliminary implementation of Commit Status API, pretty much compatible with GitHub. 1. The Commit Statuses are stored in separate table: ci_commit_status. 2. The POST inserts a new row. 3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization: - Using authorized user - Using ci-token to allow easy posting from CI Services 4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics). 5. This adds statuses to commit's builds view. 6. The commit's status is calculated taking into account status of all builds and all posted statuses. 7. The commit statuses doesn't trigger notifications. 8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`. 9. We still miss a few tests and documentation updates for API and CI. @dzaporozhets @sytses What do you think? See merge request !1530
| * | | | | | | Fix retry and cancel URLscommit_statusKamil Trzcinski2015-10-131-2/+4
| | | | | | | |
| * | | | | | | Fix feature testsKamil Trzcinski2015-10-122-2/+2
| | | | | | | |
| * | | | | | | Fix broken matrix_for_ref?Kamil Trzcinski2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
| * | | | | | | Fix broken testsKamil Trzcinski2015-10-123-7/+8
| | | | | | | |
| * | | | | | | Fix some changesKamil Trzcinski2015-10-122-2/+2
| | | | | | | |
| * | | | | | | Rename builds_without_retry to latest_buildsKamil Trzcinski2015-10-127-14/+14
| | | | | | | |
| * | | | | | | Fix commit skippingKamil Trzcinski2015-10-122-7/+7
| | | | | | | |
| * | | | | | | Update renderingKamil Trzcinski2015-10-126-87/+64
| | | | | | | |
| * | | | | | | Small bug fixesKamil Trzcinski2015-10-125-22/+39
| | | | | | | |
| * | | | | | | Add Commit Status documentationKamil Trzcinski2015-10-124-12/+94
| | | | | | | |
| * | | | | | | Add author to statusesKamil Trzcinski2015-10-124-1/+11
| | | | | | | |
| * | | | | | | Fix commit status POST URLKamil Trzcinski2015-10-122-4/+4
| | | | | | | |
| * | | | | | | Implement Commit Status APIKamil Trzcinski2015-10-1230-312/+767
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'css-cleanup' into 'master' Dmitriy Zaporozhets2015-10-137-25/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small css cleanup Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1582
| * | | | | | | Small css cleanupcss-cleanupDmitriy Zaporozhets2015-10-137-25/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status