summaryrefslogtreecommitdiff
Commit message (Expand)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 reversibleadd-existence-checks-in-backported-migrations-ceRémy Coutable2017-01-242-2/+16
* | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-2413-106/+141
|\ \
| * | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| * | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-2312-104/+141
* | | Merge branch '24923_nested_tasks' into 'master' Sean McGivern2017-01-245-5/+89
|\ \ \
| * | | 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.Arnd2017-01-231-1/+1
* | | | | Merge branch 'docs/conflict-editor' into 'master' Achilleas Pipinellis2017-01-242-0/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add docs for resolve conflicts editorAchilleas Pipinellis2017-01-242-0/+12
|/ / / /
* | | | Merge branch 'docs/2fa-cleanup' into 'master' Achilleas Pipinellis2017-01-2411-215/+224
|\ \ \ \
| * | | | Merge the two 2FA docs into oneAchilleas Pipinellis2017-01-2411-215/+224
|/ / / /
* | | | Merge branch 'docs/issues-due-dates' into 'master' Achilleas Pipinellis2017-01-249-0/+38
|\ \ \ \
| * | | | Add due dates docsAchilleas Pipinellis2017-01-249-0/+38
* | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-249-4/+235
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Search feature: redirects to commit page if query is commit sha and only comm...YarNayar2017-01-245-1/+57
| * | | | Allows to search within project by commit's hashYarNayar2017-01-246-4/+179
* | | | | Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ \ \ \ \
| * | | | | Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
* | | | | | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-242-16/+10
|\ \ \ \ \ \
| * | | | | | 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 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 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 link to confidential issues MRAchilleas Pipinellis2017-01-241-1/+2
| * | | | | | | Add docs for confidential issuesAchilleas Pipinellis2017-01-249-14/+86
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'zj-requeue-pending-delete' into 'master' Yorick Peterse2017-01-242-0/+53
|\ \ \ \ \ \ \
| * | | | | | | 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
| |/ / / / / /
* | | | | | | 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 linksdisable-automatic-login-on-email-confirmationBrian Neel2016-12-312-6/+6
* | | | | | | Merge branch '27066-textarea-border' into 'master' Fatih Acet2017-01-232-1/+4
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' Robert Speicher2017-01-233-10/+32
| * | | | | | | Merge branch 'fix-api-mr-permissions' into 'security'Robert Speicher2017-01-238-25/+68
| * | | | | | | Merge branch 'fix/rename-group-export-vuln' into 'security' Robert Speicher2017-01-233-2/+91
| * | | | | | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Robert Speicher2017-01-232-3/+11
* | | | | | | | 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 -> reviewerno-more-bossesSean McGivern2017-01-132-10/+10
* | | | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'...Douwe Maan2017-01-2315-56/+243
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-1315-56/+243
| |/ / / / / / / /
* | | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-233-2/+15
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status