summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge request, better error handlingmerge_request_errorValery Sizov2015-09-299-5/+38
* 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
* | | Merge branch 'doc-omniauth-ldap-limitations' into 'master' Douwe Maan2015-09-291-0/+20
|\ \ \
| * | | Documentation of omniauth-ldap limitations Julio2015-09-241-0/+20
* | | | Merge branch 'orphaned-repo-cleanup' into 'master' Douwe Maan2015-09-292-35/+17
|\ \ \ \
| * | | | 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
* | | | | 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-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 settingsmove-variables-pageDmitriy Zaporozhets2015-09-2810-57/+47
| * | | | | | | Merge branch 'krb_auth_helper_ce' into 'master' Douwe Maan2015-09-291-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Remove 'kerberos' from auth_helper.rb for gitlab-CE.Ben Rosser2015-09-241-1/+1
* | | | | | | | Merge branch 'linktoee' into 'master' Sytse Sijbrandij2015-09-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-2819-125/+123
|\ \ \ \ \ \ \
| * | | | | | | Add missing spec filemove-runners-pageDmitriy Zaporozhets2015-09-281-0/+87
| * | | | | | | Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-284-98/+3
| * | | | | | | Move runners page to project settingsDmitriy Zaporozhets2015-09-2514-105/+111
| * | | | | | | Fix admin runner page -> assign all buttonDmitriy Zaporozhets2015-09-251-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'cyrillic-font' into 'master' Dmitriy Zaporozhets2015-09-284-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Update Source Sans Pro font: adds support for cyrillic characterscyrillic-fontDmitriy Zaporozhets2015-09-284-0/+0
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-09-2822-119/+444
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'projects'Dmitriy Zaporozhets2015-09-2822-119/+444
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | !important removed from preAndrey2015-09-283-10/+5
| | * | | | | | edit action allignAndrey2015-09-282-6/+6