Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'move-ci-settings' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 8 | -53/+62 |
|\ | |||||
| * | Move CI project settings page to CE project settings areamove-ci-settings | Dmitriy Zaporozhets | 2015-09-29 | 8 | -53/+62 |
* | | Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Link directly to the projects page instead of the root controller | Stan Hu | 2015-09-28 | 1 | -1/+1 |
* | | Merge branch 'ci-commits-to-projects' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 7 | -34/+58 |
|\ \ | |||||
| * | | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projects | Kamil Trzcinski | 2015-09-29 | 2 | -9/+3 |
| * | | Rename commits to ci_commits | Kamil Trzcinski | 2015-09-29 | 2 | -4/+10 |
| * | | Fix rubocop | Kamil Trzcinski | 2015-09-29 | 1 | -2/+2 |
| * | | Fix tests | Kamil Trzcinski | 2015-09-29 | 3 | -5/+4 |
| * | | Fix register_build_service tests | Kamil Trzcinski | 2015-09-29 | 2 | -3/+7 |
| * | | Revert check_enable_flag! changes | Kamil Trzcinski | 2015-09-29 | 1 | -4/+4 |
| * | | Fix tests | Kamil Trzcinski | 2015-09-29 | 3 | -11/+24 |
| * | | WIP | Kamil Trzcinski | 2015-09-29 | 5 | -24/+27 |
| * | | WIP | Kamil Trzcinski | 2015-09-29 | 4 | -6/+11 |
* | | | Move CI triggers page to project settings areamove-triggers-page | Dmitriy Zaporozhets | 2015-09-29 | 6 | -54/+46 |
|/ / | |||||
* | | Merge branch 'projects' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 2 | -1/+8 |
|\ \ | |||||
| * | | page-title-fix | Andrey | 2015-09-28 | 2 | -1/+8 |
* | | | Merge branch 'move-variables-page' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 7 | -47/+39 |
|\ \ \ | |||||
| * | | | Move CI variables page to project settingsmove-variables-page | Dmitriy Zaporozhets | 2015-09-28 | 7 | -47/+39 |
| | |/ | |/| | |||||
* | | | Merge branch 'krb_auth_helper_ce' into 'master' | Douwe Maan | 2015-09-29 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Remove 'kerberos' from auth_helper.rb for gitlab-CE. | Ben Rosser | 2015-09-24 | 1 | -1/+1 |
* | | | Merge branch 'move-runners-page' | Dmitriy Zaporozhets | 2015-09-28 | 16 | -100/+107 |
|\ \ \ | |||||
| * | | | Finish move of runners page to project settings | Dmitriy Zaporozhets | 2015-09-28 | 2 | -2/+2 |
| * | | | Move runners page to project settings | Dmitriy Zaporozhets | 2015-09-25 | 13 | -97/+104 |
| * | | | Fix admin runner page -> assign all button | Dmitriy Zaporozhets | 2015-09-25 | 1 | -1/+1 |
* | | | | Merge branch 'cyrillic-font' into 'master' | Dmitriy Zaporozhets | 2015-09-28 | 4 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Update Source Sans Pro font: adds support for cyrillic characterscyrillic-font | Dmitriy Zaporozhets | 2015-09-28 | 4 | -0/+0 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Douwe Maan | 2015-09-28 | 21 | -117/+443 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'projects' | Dmitriy Zaporozhets | 2015-09-28 | 21 | -117/+443 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | !important removed from pre | Andrey | 2015-09-28 | 3 | -10/+5 |
| | * | | | edit action allign | Andrey | 2015-09-28 | 2 | -6/+6 |
| | * | | | Project page Update | Andrey | 2015-09-25 | 12 | -195/+263 |
| | * | | | UI changes to the project view, empty project and project list new project bu... | Andrey | 2015-09-24 | 9 | -69/+373 |
* | | | | | Merge branch 'fxposter/gitlab-ce-login-from-admin' | Douwe Maan | 2015-09-28 | 2 | -0/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove stuff from previous UI | Pavel Forkert | 2015-09-24 | 1 | -1/+1 |
| * | | | | Move login button to user page, switched to POST method | Pavel Forkert | 2015-09-24 | 2 | -1/+2 |
| * | | | | Add option to admin area to sign in as a specific user | Pavel Forkert | 2015-09-24 | 2 | -1/+8 |
* | | | | | Merge branch 'add-activity-dashboard-preference' into 'master' | Dmitriy Zaporozhets | 2015-09-28 | 3 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Add user preference to view project activity and starred project activity as ... | Stan Hu | 2015-09-26 | 3 | -2/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix grammar in admin area labels .nothing-here-block when no labels exist. | Aaron Snyder | 2015-09-26 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs' | Dmitriy Zaporozhets | 2015-09-25 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix Error 500 in creating merge requests with > 1000 diffs | Stan Hu | 2015-09-25 | 1 | -2/+2 |
* | | | | | Merge branch 'fix-stuck-forked-project-import' into 'master' | Dmitriy Zaporozhets | 2015-09-25 | 1 | -2/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Use after_commit_queue to schedule import job immediately | Stan Hu | 2015-09-25 | 1 | -5/+8 |
| * | | | | Fix bug where projects would appear to be stuck in the forked import state | Stan Hu | 2015-09-25 | 1 | -1/+3 |
* | | | | | Merge branch 'handle-bad-head' into 'master' | Dmitriy Zaporozhets | 2015-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Error 500 occuring with repositories that have a bad HEAD | Stan Hu | 2015-09-24 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'get-ci-token-from-ci-projects' into 'master' | Robert Speicher | 2015-09-24 | 2 | -3/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix specs | Kamil Trzcinski | 2015-09-24 | 1 | -1/+1 |
| * | | | | Remove unneeded change | Kamil Trzcinski | 2015-09-24 | 1 | -1/+2 |