summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'update-docker' into 'master' Kamil Trzciński2015-09-308-356/+7
|\ | | | | | | | | | | | | | | Update docker guide and add docker-compose.yml /cc @JobV @sytses See merge request !1473
| * Fix typoKamil Trzcinski2015-09-301-1/+1
| |
| * Update docker guide and add docker-compose.ymlupdate-dockerKamil Trzcinski2015-09-308-356/+7
| |
* | Merge branch 'merge-ci-data'Kamil Trzcinski2015-09-301-1/+1
|\ \
| * | Fix migrationmerge-ci-dataKamil Trzcinski2015-09-301-1/+1
| | |
* | | Merge branch 'fix-view-admin-applications-text' into 'master' Robert Speicher2015-09-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fixes english information paragraph in admin/applications view See merge request !1470
| * | | Adds newline at end of fileDiogo Resende2015-09-301-1/+1
| | | |
| * | | Adds missing plural form of applications of previous commitDiogo Resende2015-09-301-1/+1
| | | |
| * | | Fixes english information paragraph in admin/applications viewDiogo Resende2015-09-301-2/+2
| | | |
* | | | Merge branch 'apache-gghs-tcp' into 'master' Robert Speicher2015-09-301-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apache needs gitlab-git-http-server on TCP [ci skip] See merge request !1462
| * | | | Apache needs gitlab-git-http-server on TCPapache-gghs-tcpJacob Vosmaer2015-09-291-0/+1
| | | | |
* | | | | Merge branch 'golang-ruby-versions' into 'master' Robert Speicher2015-09-301-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Ruby and Golang versions [ci skip] See merge request !1467
| * | | | | Use Ruby 2.1.7 for new installs from sourcegolang-ruby-versionsJacob Vosmaer2015-09-291-2/+3
| | | | | |
| * | | | | Use Golang 1.5.1 for new installs from sourceJacob Vosmaer2015-09-291-4/+4
| |/ / / /
* | | | | Merge branch 'merge-ci-data' into 'master' Dmitriy Zaporozhets2015-09-3012-98/+122
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use data stored in projects instead of ci_projects - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc. /cc @dzaporozhets See merge request !1404
| * | | | Fix sometimes failing testsKamil Trzcinski2015-09-301-5/+5
| | | | |
| * | | | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-3012-93/+117
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.
* | | | Merge branch 'fix-removed-file-in-diff' into 'master' Dmitriy Zaporozhets2015-09-306-51/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when removed file was not appearing in merge request diff Finally we can see removed files in merge request diff :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2533 See merge request !1471
| * | | | Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-302-36/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-304-15/+34
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'cleanup-ci-helpers' into 'master' Dmitriy Zaporozhets2015-09-3014-144/+94
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup ci helpers Part of #2594 See merge request !1466
| * | | | Fix CI mailercleanup-ci-helpersDmitriy Zaporozhets2015-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor CI helpersDmitriy Zaporozhets2015-09-2913-143/+94
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-clear-crontab-in-ci-migration-guide' into 'master' Kamil Trzciński2015-09-301-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add a missing RAILS_ENV=production to fix crontab clearing in the CI migration guide All other commands in the guide set this env var, but it's missing for the `whenever --clear-crontab` call and this causes it to not clear the crontab properly. See merge request !1474
| * | | | Add a missing RAILS_ENV=production to crontab clearingDimitar Dimitrov2015-09-301-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | All other commands in the guide set this env var, but it's missing here and this causes whenever not to clear the crontab file of gitab_ci properly.
* | | | 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
View Lorry Controller Status