summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'move-ci-settings' into 'master' Dmitriy Zaporozhets2015-09-308-53/+62
|\
| * Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-298-53/+62
* | 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-297-34/+58
|\ \
| * | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projectsKamil Trzcinski2015-09-292-9/+3
| * | Rename commits to ci_commitsKamil Trzcinski2015-09-292-4/+10
| * | Fix rubocopKamil Trzcinski2015-09-291-2/+2
| * | Fix testsKamil Trzcinski2015-09-293-5/+4
| * | Fix register_build_service testsKamil Trzcinski2015-09-292-3/+7
| * | Revert check_enable_flag! changesKamil Trzcinski2015-09-291-4/+4
| * | Fix testsKamil Trzcinski2015-09-293-11/+24
| * | WIPKamil Trzcinski2015-09-295-24/+27
| * | WIPKamil Trzcinski2015-09-294-6/+11
* | | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-296-54/+46
|/ /
* | Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-09-292-1/+8
|\ \
| * | page-title-fixAndrey2015-09-282-1/+8
* | | Merge branch 'move-variables-page' into 'master' Dmitriy Zaporozhets2015-09-297-47/+39
|\ \ \
| * | | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-287-47/+39
| | |/ | |/|
* | | 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 'move-runners-page'Dmitriy Zaporozhets2015-09-2816-100/+107
|\ \ \
| * | | Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-282-2/+2
| * | | Move runners page to project settingsDmitriy Zaporozhets2015-09-2513-97/+104
| * | | 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-2821-117/+443
|\ \ \ \ \
| * \ \ \ \ Merge branch 'projects'Dmitriy Zaporozhets2015-09-2821-117/+443
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | !important removed from preAndrey2015-09-283-10/+5
| | * | | edit action allignAndrey2015-09-282-6/+6
| | * | | Project page UpdateAndrey2015-09-2512-195/+263
| | * | | UI changes to the project view, empty project and project list new project bu...Andrey2015-09-249-69/+373
* | | | | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-282-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove stuff from previous UIPavel Forkert2015-09-241-1/+1
| * | | | Move login button to user page, switched to POST methodPavel Forkert2015-09-242-1/+2
| * | | | Add option to admin area to sign in as a specific userPavel Forkert2015-09-242-1/+8
* | | | | Merge branch 'add-activity-dashboard-preference' into 'master' Dmitriy Zaporozhets2015-09-283-2/+8
|\ \ \ \ \
| * | | | | Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-263-2/+8
| | |_|/ / | |/| | |
* | | | | Fix grammar in admin area labels .nothing-here-block when no labels exist.Aaron Snyder2015-09-261-2/+2
|/ / / /
* | | | Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'Dmitriy Zaporozhets2015-09-251-2/+2
|\ \ \ \
| * | | | Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-251-2/+2
* | | | | Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-251-2/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use after_commit_queue to schedule import job immediatelyStan Hu2015-09-251-5/+8
| * | | | Fix bug where projects would appear to be stuck in the forked import stateStan Hu2015-09-251-1/+3
* | | | | Merge branch 'handle-bad-head' into 'master' Dmitriy Zaporozhets2015-09-251-1/+1
|\ \ \ \ \
| * | | | | Fix Error 500 occuring with repositories that have a bad HEADStan Hu2015-09-241-1/+1
| |/ / / /
* | | | | Merge branch 'get-ci-token-from-ci-projects' into 'master' Robert Speicher2015-09-242-3/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix specsKamil Trzcinski2015-09-241-1/+1
| * | | | Remove unneeded changeKamil Trzcinski2015-09-241-1/+2