summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* API v4 no longer accepts `iid` for Issuestc-v4-api-namespaceToon Claes2017-01-265-16/+1441
| | | | But make API v3 working like it was.
* Pass current version as default for api helper methodOswaldo Ferreira2017-01-251-2/+2
|
* Add new v4 namespace supportOswaldo Ferreira2017-01-251-1/+2
|
* Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ | | | | | | | | Small update to the Mattermost API See merge request !8712
| * Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
| | | | | | | | | | These changes make it possible to wrap multiple API requests in one session.
* | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-242-16/+10
|\ \ | | | | | | | | | | | | Grapify all endpoints of the deploy keys API See merge request !8721
| * | Grapify all endpoints of the deploy keys APIgrapify-deploy-keysRobert Schilling2017-01-232-16/+10
| | |
* | | Merge branch 'patch-12' into 'master' James Lopez2017-01-242-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix hash of ruby in update documentation See merge request !8735
| * | | Fix hash of ruby archive in documentationMaximilien Cuony2017-01-242-2/+2
| | |/ | |/|
* | | Merge branch 'backport-ee-1051-approvals-reset-on-closed-mr' into 'master' Sean McGivern2017-01-244-39/+52
|\ \ \ | | | | | | | | | | | | | | | | Backport EE changes on approvals reset for closed MRs See merge request !8559
| * | | Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mrOswaldo Ferreira2017-01-234-39/+52
| | | |
* | | | Merge branch 'docs/confidential-issues' into 'master' Achilleas Pipinellis2017-01-249-14/+87
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for confidential issues Closes #14397 See merge request !8741
| * | | | Add link to confidential issues MRAchilleas Pipinellis2017-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add docs for confidential issuesAchilleas Pipinellis2017-01-249-14/+86
| | |/ / | |/| | | | | | | | | | [ci skip]
* | | | Merge branch 'zj-requeue-pending-delete' into 'master' Yorick Peterse2017-01-242-0/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Requeue projects pending deletion See merge request !8438
| * | | | Reject projects without namespacezj-requeue-pending-deleteZ.J. van de Weg2017-01-241-0/+1
| | | | |
| * | | | Quote class name in case it gets destroyedZeger-Jan van de Weg2017-01-241-1/+1
| | | | |
| * | | | Requeue projects pending deletionZ.J. van de Weg2017-01-242-0/+52
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been several bugs in the project deletion service and worker. Resulting in projects stuck in pending delete state, which limits users to create projects with the same name, keeps stale records in the database, and all kinds of other trouble. This post deployment migration requeues all these projects for deletion, in the hope that most of these could be removed by the updated code.
* | | | Merge branch 'disable-automatic-login-on-email-confirmation' into 'master' Marin Jankovski2017-01-242-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Disable automatic login feature when clicking on email confirmation links See merge request !7472
| * | | Disable automatic login feature when clicking on email confirmation linksdisable-automatic-login-on-email-confirmationBrian Neel2016-12-312-6/+6
| | | |
* | | | Merge branch '27066-textarea-border' into 'master' Fatih Acet2017-01-232-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Comment/Description textarea shows a blue border on the left" Closes #27066 See merge request !8720
| * | | | Remove hover styling for generic textarea27066-textarea-borderAnnabel Dunstone Gray2017-01-232-1/+4
| | |_|/ | |/| |
* | | | Merge branch 'rs-pick-security-fixes' into 'master' Robert Speicher2017-01-2320-43/+213
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick security fixes from 8.16.1 et al into master Closes #26813, #26249, #26259, #26243, #26242 See merge request !8724
| * | | | Add a changelog entry for #26242rs-pick-security-fixesRobert Speicher2017-01-231-0/+4
| | | | |
| * | | | Merge branch 'upgrade-omniauth' into 'security' Robert Speicher2017-01-233-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade OmniAuth Ruby gem to 1.3.2 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813 See merge request !2056
| * | | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' Robert Speicher2017-01-233-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Prevent users from creating notes on resources they can't access See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2054
| * | | | Merge branch 'fix-api-mr-permissions' into 'security'Robert Speicher2017-01-238-25/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that only privileged users can access merge requests in the API See merge request !2053
| * | | | Merge branch 'fix/rename-group-export-vuln' into 'security' Robert Speicher2017-01-233-2/+91
| | | | | | | | | | | | | | | | | | | | | | | | | Fix export files not removed when a user takes over a namespace See merge request !2051
| * | | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Robert Speicher2017-01-232-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Fix users being able to delete instance public deployment keys See merge request !2049
* | | | | Merge branch 'no-more-bosses' into 'master' 27019-merge-when-pipeline-succeeds-visible-if-approvals-are-pendingStan Hu2017-01-232-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename endboss -> maintainer, miniboss -> reviewer See merge request !8719
| * | | | | Rename endboss -> maintainer, miniboss -> reviewerno-more-bossesSean McGivern2017-01-132-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to describe these roles in a way that is more understandable to people not familiar with GitLab.
* | | | | | Merge branch ↵Douwe Maan2017-01-2315-56/+243
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22619-add-an-email-address-to-unsubscribe-list-header-in-email' into 'master' Handle unsubscribe notification via email Closes #22619 See merge request !6597
| * | | | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-1315-56/+243
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | - allows unsubscription processing of email in format "reply+%{key}+unsubscribe@acme.com" (example) - if config.address includes %{key} and replies are enabled every unsubscriable message will include mailto: link in its List-Unsubscribe header
* | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-233-2/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow creating protected branches when user can merge to such branch Closes #22638 See merge request !8458
| * | | | | | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-133-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if user has either push or merge permissions + Change log entry for fix to creating a branch matching a wildcard fails
* | | | | | | Merge branch '25989-fix-rogue-scrollbars-on-comments' into 'master' Annabel Dunstone Gray2017-01-232-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove rogue scrollbars from some issue comments Closes #25989 See merge request !8652
| * | | | | | | Remove rogue scrollbars for some issue comments25989-fix-rogue-scrollbars-on-commentsEric Eastwood2017-01-192-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/25989
* | | | | | | | Merge branch 'issue-filter-click-to-search' into 'master' Jacob Schatz2017-01-2312-36/+62
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Allow issue filter submission using mouse only See merge request !8681
| * | | | | | | add CHANGELOG.md entry for !8681issue-filter-click-to-searchMike Greiling2017-01-211-0/+4
| | | | | | | |
| * | | | | | | update tests to correspond with new behaviorMike Greiling2017-01-216-29/+29
| | | | | | | |
| * | | | | | | add a space after selecting a dropdown itemMike Greiling2017-01-212-2/+11
| | | | | | | |
| * | | | | | | allow issue filter submission by clicking "Keep typing and press enter"Mike Greiling2017-01-214-1/+18
| | | | | | | |
| * | | | | | | remove vestigial onsubmit event triggerMike Greiling2017-01-211-4/+0
| | | | | | | |
* | | | | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-2338-74/+137
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds events to services api deserialization Closes #22974 See merge request !8324
| * | | | | | | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-2230-147/+17
| | | | | | | |
| * | | | | | | adds events to services api deserializationTiago Botelho2017-01-2237-66/+259
| |/ / / / / /
* | | | | | | Merge branch '26787-add-copy-icon-hover-state' into 'master' Annabel Dunstone Gray2017-01-232-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hover style for copy icon in commit page header Closes #26787 See merge request !8619
| * | | | | | | Add hover style for copy icon in commit page headerRyan Harris2017-01-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change hover style definition from explicit rgba value to variable Removed style from page-header.scss that was overriding .btn styles Add hover style for copy icon in commit page header Change hover style definition from explicit rgba value to variable Removed unnecessary styles on commits.scss
* | | | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-2324-210/+741
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503
| * | | | | | | | Fix warnings argument memoization in CI/CD stagefeature/success-warning-icons-in-stages-buildsGrzegorz Bizon2017-01-192-6/+24
| | | | | | | | |