summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Golang download instructions assume amd64golang-i386Jacob Vosmaer2015-10-011-0/+3
* Merge branch 'ci-fixes' into 'master' Kamil Trzciński2015-10-013-9/+22
|\
| * Fix: CI token removal regression from build traceci-fixesKamil Trzcinski2015-10-012-7/+21
| * Fix: broken git clone URL for CI runnersKamil Trzcinski2015-10-011-2/+1
* | Merge branch 'fix-ui-bug' into 'master' Dmitriy Zaporozhets2015-10-012-42/+42
|\ \
| * | Fix UI bug introduced in new project pagefix-ui-bugDmitriy Zaporozhets2015-10-012-42/+42
* | | Merge branch 'flevour/gitlab-ce-fix-merge-request-textareas'Douwe Maan2015-10-013-3/+6
|\ \ \
| * \ \ Merge branch 'master' into flevour/gitlab-ce-fix-merge-request-textareasDouwe Maan2015-10-01352-3288/+3631
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-10-0151-590/+440
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'migration-doc-update' into 'master' Jacob Vosmaer2015-10-011-0/+105
| |\ \ \
| | * | | Update migration documentationKamil Trzcinski2015-10-011-0/+105
| * | | | Update db schemaDmitriy Zaporozhets2015-10-011-1/+1
| * | | | Merge branch 'mr_improve_errors_handling'Dmitriy Zaporozhets2015-10-017-6/+33
| |\ \ \ \
| | * | | | Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-017-6/+33
| * | | | | Merge branch 'include-full-path-in-new-mr-page' into 'master' Dmitriy Zaporozhets2015-10-015-14/+49
| |\ \ \ \ \
| | * | | | | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-305-14/+49
| | |/ / / /
| * | | | | Merge branch 'project_moving' into 'master' Dmitriy Zaporozhets2015-10-0110-14/+18
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Note the original location of a moved project when notifying users of the moveproject_movingValery Sizov2015-10-0110-14/+18
| | |/ / /
| * | | | Merge branch 'rs-disable-signin-after-reset' into 'master' Douwe Maan2015-10-013-45/+28
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-303-45/+28
| | | |/ | | |/|
| * | | 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 'flevour/gitlab-ce-project-path-insensitive-lookup'Douwe Maan2015-10-016-7/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-01311-2714/+3180
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |