summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-2565-103/+114
|
* Merge branch 'add-existence-checks-in-backported-migrations-ce' into 'master' Robert Speicher2017-01-242-2/+16
|\ | | | | | | | | Make the time estimate migrations reversible See merge request !8749
| * Make the time estimate migrations reversibleadd-existence-checks-in-backported-migrations-ceRémy Coutable2017-01-242-2/+16
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-2413-106/+141
|\ \ | | | | | | | | | | | | Dont persist application settings in test env See merge request !8715
| * | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-2312-104/+141
| | | | | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
* | | Merge branch '24923_nested_tasks' into 'master' Sean McGivern2017-01-245-5/+89
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix nested tasks in ordered list Closes #24923 See merge request !8626
| * | | fix nested tasks in ordered listJarka Kadlecova2017-01-245-5/+89
| | | |
* | | | Merge branch 'patch-12' into 'master' Rémy Coutable2017-01-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typo in link to "Services Templates" page. See merge request !8709
| * | | | Fix typo in link to "Services Templates" page.Arnd2017-01-231-1/+1
| | | | |
* | | | | Merge branch 'docs/conflict-editor' into 'master' Achilleas Pipinellis2017-01-242-0/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Add docs for resolve conflicts editor See merge request !8748
| * | | | Add docs for resolve conflicts editorAchilleas Pipinellis2017-01-242-0/+12
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'docs/2fa-cleanup' into 'master' Achilleas Pipinellis2017-01-2411-215/+224
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge the two 2FA docs into one See merge request !8747
| * | | | Merge the two 2FA docs into oneAchilleas Pipinellis2017-01-2411-215/+224
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'docs/issues-due-dates' into 'master' Achilleas Pipinellis2017-01-249-0/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add due dates docs See merge request !8744
| * | | | Add due dates docsAchilleas Pipinellis2017-01-249-0/+38
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵Sean McGivern2017-01-249-4/+235
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028
| * | | | Search feature: redirects to commit page if query is commit sha and only ↵YarNayar2017-01-245-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit found See !8028 and #24833
| * | | | Allows to search within project by commit's hashYarNayar2017-01-246-4/+179
| | | | | | | | | | | | | | | | | | | | Was proposed in #24833
* | | | | 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
View Lorry Controller Status