summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update docker guide and add docker-compose.ymlupdate-dockerKamil Trzcinski2015-09-308-356/+7
|
* Merge branch 'move-ci-settings' into 'master' Dmitriy Zaporozhets2015-09-3012-71/+86
|\ | | | | | | | | | | | | | | | | Move CI project settings page to CE project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1465
| * Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-2912-71/+86
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master' Dmitriy Zaporozhets2015-09-291-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | Link directly to the projects page instead of the root controller If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. Fixes bug introduced by !1446. See merge request !1459
| * Link directly to the projects page instead of the root controllerStan Hu2015-09-281-1/+1
| | | | | | | | | | | | If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. Fixes bug introduced by !1446.
* | Merge branch 'ci-commits-to-projects' into 'master' Dmitriy Zaporozhets2015-09-2939-156/+209
|\ \ | | | | | | | | | | | | | | | | | | Make Ci::Commits belong to Project instead of Ci::Project See merge request !1455
| * | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projectsKamil Trzcinski2015-09-295-16/+9
| | |
| * | Fix migrationsKamil Trzcinski2015-09-292-23/+11
| | |
| * | Fix testsKamil Trzcinski2015-09-294-8/+9
| | |
| * | Rename commits to ci_commitsKamil Trzcinski2015-09-293-6/+12
| | |
| * | Fix rubocopKamil Trzcinski2015-09-291-2/+2
| | |
| * | Fix testsKamil Trzcinski2015-09-296-14/+10
| | |
| * | Fix register_build_service testsKamil Trzcinski2015-09-293-8/+11
| | |
| * | Revert check_enable_flag! changesKamil Trzcinski2015-09-291-4/+4
| | |
| * | Fix db/schema.rbKamil Trzcinski2015-09-291-26/+29
| | |
| * | Fix migrationsKamil Trzcinski2015-09-295-32/+15
| | |
| * | Fix testsKamil Trzcinski2015-09-2911-49/+73
| | |
| * | WIPKamil Trzcinski2015-09-2929-135/+154
| | |
| * | WIPKamil Trzcinski2015-09-297-6/+43
| | |
* | | Merge branch 'move-triggers-page' into 'master' Dmitriy Zaporozhets2015-09-299-60/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI triggers page to project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1461
| * | | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-299-60/+53
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' into 'master' Jacob Vosmaer2015-09-295-17/+24
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for AWS S3 Server-Side Encryption support This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. ## Points to double check I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages I also think I've managed to catch all of the documentation for this change as well. ### Why is this required Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of. Relates to issue #2478. See merge request !1280
| * | Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-255-17/+24
| | | | | | | | | | | | | | | | | | | | | This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. This is optional and not required to make S3 uploads work.
* | | Merge branch 'doc-omniauth-ldap-limitations' into 'master' Douwe Maan2015-09-291-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation of omniauth-ldap limitations Further documentation about limitations directly impacting settings of users' LDAP servers. Closes #2613 See merge request !1421
| * | | Documentation of omniauth-ldap limitations Julio2015-09-241-0/+20
| | | | | | | | | | | | | | | | Further documentation about limitations directly impacting settings of users' LDAP servers.
* | | | Merge branch 'orphaned-repo-cleanup' into 'master' Douwe Maan2015-09-292-35/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve repo cleanup task I accidentally wrote a new script, not seeing we already had one. But the old one did not do enough (it only handled global namespace orhpans) so I figured I should just drop in the new script. See merge request !1298
| * | | | Improve 'rake gitlab:cleanup:repos' documentationorphaned-repo-cleanupJacob Vosmaer2015-09-251-1/+2
| | | | |
| * | | | Guard against trailing slashes in repos_pathJacob Vosmaer2015-09-151-1/+5
| | | | |
| * | | | Improve repo cleanup taskJacob Vosmaer2015-09-151-34/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Clean up more than just global (legacy) repos. Also, instead of deleting, just rename.
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-292-1/+8
|\ \ \ \ \
| * \ \ \ \ Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-09-292-1/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page-title-fix Fixed .page-title margin See merge request !1458
| | * | | | | page-title-fixAndrey2015-09-282-1/+8
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-2911-58/+48
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'move-variables-page' into 'master' Dmitriy Zaporozhets2015-09-2910-57/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI variables page to project settings Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1457
| | * | | | | | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-2810-57/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'krb_auth_helper_ce' into 'master' Douwe Maan2015-09-291-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'kerberos' from auth_helper.rb for gitlab-CE. There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510). @DouweM suggested I send in this merge request. See merge request !1430
| | * | | | | | Remove 'kerberos' from auth_helper.rb for gitlab-CE.Ben Rosser2015-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510
* | | | | | | | Merge branch 'linktoee' into 'master' Sytse Sijbrandij2015-09-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note about EE git hooks Because of https://gitlab.com/gitlab-com/www-gitlab-com/issues/415#note_2131220 See merge request !1934
| * | | | | | | changed wordskaren Carias2015-09-281-1/+1
| | | | | | | |
| * | | | | | | note about EE git hookskaren Carias2015-09-191-1/+1
| | | | | | | |
* | | | | | | | Update CHANGELOG for 8.0.3Robert Speicher2015-09-281-3/+4
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-2819-125/+123
|\ \ \ \ \ \ \
| * | | | | | | Add missing spec filemove-runners-pageDmitriy Zaporozhets2015-09-281-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-284-98/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Move runners page to project settingsDmitriy Zaporozhets2015-09-2514-105/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix admin runner page -> assign all buttonDmitriy Zaporozhets2015-09-251-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'cyrillic-font' into 'master' Dmitriy Zaporozhets2015-09-284-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Source Sans Pro font: adds support for cyrillic characters Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2764 See merge request !1454
| * | | | | | | Update Source Sans Pro font: adds support for cyrillic characterscyrillic-fontDmitriy Zaporozhets2015-09-284-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-09-2822-119/+444
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'projects'Dmitriy Zaporozhets2015-09-2822-119/+444
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status