summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simplify Note#editable?rs-update-noteRobert Speicher2015-09-301-1/+1
* Ensure notes are highlighted properly when they're updatedRobert Speicher2015-09-301-7/+9
* Don't render the edit_form view for system notesRobert Speicher2015-09-301-1/+3
* Merge branch 'update-docker' into 'master' Kamil Trzciński2015-09-308-356/+7
|\
| * 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
|\ \ \
| * | | 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 TCPapache-gghs-tcpJacob Vosmaer2015-09-291-0/+1
* | | | | Merge branch 'golang-ruby-versions' into 'master' Robert Speicher2015-09-301-6/+7
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix sometimes failing testsKamil Trzcinski2015-09-301-5/+5
| * | | | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-3012-93/+117
| | |_|/ | |/| |
* | | | Merge branch 'fix-removed-file-in-diff' into 'master' Dmitriy Zaporozhets2015-09-306-51/+70
|\ \ \ \
| * | | | Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-302-36/+36
| * | | | Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-304-15/+34
| |/ / /
* | | | Merge branch 'cleanup-ci-helpers' into 'master' Dmitriy Zaporozhets2015-09-3014-144/+94
|\ \ \ \
| * | | | Fix CI mailercleanup-ci-helpersDmitriy Zaporozhets2015-09-301-1/+0
| * | | | Refactor CI helpersDmitriy Zaporozhets2015-09-2913-143/+94
* | | | | 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 crontab clearingDimitar Dimitrov2015-09-301-1/+1
|/ / / /
* | | | Merge branch 'move-ci-settings' into 'master' Dmitriy Zaporozhets2015-09-3012-71/+86
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-2912-71/+86
* | | 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 controllerStan Hu2015-09-281-1/+1
* | | Merge branch 'ci-commits-to-projects' into 'master' Dmitriy Zaporozhets2015-09-2939-156/+209
|\ \ \
| * | | 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 areamove-triggers-pageDmitriy Zaporozhets2015-09-299-60/+53
| |/ /
* | | Merge branch 'master' into 'master' Jacob Vosmaer2015-09-295-17/+24
|\ \ \ | |/ / |/| |
| * | Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-255-17/+24