Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix UI bug introduced in new project pagefix-ui-bug | Dmitriy Zaporozhets | 2015-10-01 | 2 | -42/+42 |
* | Merge branch 'migration-doc-update' into 'master' | Jacob Vosmaer | 2015-10-01 | 1 | -0/+105 |
|\ | |||||
| * | Update migration documentation | Kamil Trzcinski | 2015-10-01 | 1 | -0/+105 |
* | | Update db schema | Dmitriy Zaporozhets | 2015-10-01 | 1 | -1/+1 |
* | | Merge branch 'mr_improve_errors_handling' | Dmitriy Zaporozhets | 2015-10-01 | 7 | -6/+33 |
|\ \ | |||||
| * | | Improve error message when merging failsmr_improve_errors_handling | Valery Sizov | 2015-10-01 | 7 | -6/+33 |
* | | | Merge branch 'include-full-path-in-new-mr-page' into 'master' | Dmitriy Zaporozhets | 2015-10-01 | 5 | -14/+49 |
|\ \ \ | |||||
| * | | | Include full path of source and target branch names in New Merge Request page | Stan Hu | 2015-09-30 | 5 | -14/+49 |
| |/ / | |||||
* | | | Merge branch 'project_moving' into 'master' | Dmitriy Zaporozhets | 2015-10-01 | 10 | -14/+18 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Note the original location of a moved project when notifying users of the moveproject_moving | Valery Sizov | 2015-10-01 | 10 | -14/+18 |
| |/ | |||||
* | | Merge branch 'rs-disable-signin-after-reset' into 'master' | Douwe Maan | 2015-10-01 | 3 | -45/+28 |
|\ \ | |/ |/| | |||||
| * | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-reset | Robert Speicher | 2015-09-30 | 3 | -45/+28 |
* | | Merge branch 'update-docker' into 'master' | Kamil Trzciński | 2015-09-30 | 8 | -356/+7 |
|\ \ | |/ |/| | |||||
| * | Fix typo | Kamil Trzcinski | 2015-09-30 | 1 | -1/+1 |
| * | Update docker guide and add docker-compose.ymlupdate-docker | Kamil Trzcinski | 2015-09-30 | 8 | -356/+7 |
* | | Merge branch 'merge-ci-data' | Kamil Trzcinski | 2015-09-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix migrationmerge-ci-data | Kamil Trzcinski | 2015-09-30 | 1 | -1/+1 |
* | | | Merge branch 'fix-view-admin-applications-text' into 'master' | Robert Speicher | 2015-09-30 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Adds newline at end of file | Diogo Resende | 2015-09-30 | 1 | -1/+1 |
| * | | | Adds missing plural form of applications of previous commit | Diogo Resende | 2015-09-30 | 1 | -1/+1 |
| * | | | Fixes english information paragraph in admin/applications view | Diogo Resende | 2015-09-30 | 1 | -2/+2 |
* | | | | Merge branch 'apache-gghs-tcp' into 'master' | Robert Speicher | 2015-09-30 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Apache needs gitlab-git-http-server on TCPapache-gghs-tcp | Jacob Vosmaer | 2015-09-29 | 1 | -0/+1 |
* | | | | | Merge branch 'golang-ruby-versions' into 'master' | Robert Speicher | 2015-09-30 | 1 | -6/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Use Ruby 2.1.7 for new installs from sourcegolang-ruby-versions | Jacob Vosmaer | 2015-09-29 | 1 | -2/+3 |
| * | | | | | Use Golang 1.5.1 for new installs from source | Jacob Vosmaer | 2015-09-29 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'merge-ci-data' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 12 | -98/+122 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Fix sometimes failing tests | Kamil Trzcinski | 2015-09-30 | 1 | -5/+5 |
| * | | | | Delegate ci_project parameters to projects | Kamil Trzcinski | 2015-09-30 | 12 | -93/+117 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix-removed-file-in-diff' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 6 | -51/+70 |
|\ \ \ \ | |||||
| * | | | | Fix invalid testsfix-removed-file-in-diff | Dmitriy Zaporozhets | 2015-09-30 | 2 | -36/+36 |
| * | | | | Fix bug when removed file was not appearing in merge request diff | Dmitriy Zaporozhets | 2015-09-30 | 4 | -15/+34 |
| |/ / / | |||||
* | | | | Merge branch 'cleanup-ci-helpers' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 14 | -144/+94 |
|\ \ \ \ | |||||
| * | | | | Fix CI mailercleanup-ci-helpers | Dmitriy Zaporozhets | 2015-09-30 | 1 | -1/+0 |
| * | | | | Refactor CI helpers | Dmitriy Zaporozhets | 2015-09-29 | 13 | -143/+94 |
* | | | | | Merge branch 'fix-clear-crontab-in-ci-migration-guide' into 'master' | Kamil Trzciński | 2015-09-30 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add a missing RAILS_ENV=production to crontab clearing | Dimitar Dimitrov | 2015-09-30 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'move-ci-settings' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 12 | -71/+86 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Move CI project settings page to CE project settings areamove-ci-settings | Dmitriy Zaporozhets | 2015-09-29 | 12 | -71/+86 |
* | | | 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 | 39 | -156/+209 |
|\ \ \ | |||||
| * | | | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projects | Kamil Trzcinski | 2015-09-29 | 5 | -16/+9 |
| * | | | Fix migrations | Kamil Trzcinski | 2015-09-29 | 2 | -23/+11 |
| * | | | Fix tests | Kamil Trzcinski | 2015-09-29 | 4 | -8/+9 |
| * | | | Rename commits to ci_commits | Kamil Trzcinski | 2015-09-29 | 3 | -6/+12 |
| * | | | Fix rubocop | Kamil Trzcinski | 2015-09-29 | 1 | -2/+2 |
| * | | | Fix tests | Kamil Trzcinski | 2015-09-29 | 6 | -14/+10 |
| * | | | Fix register_build_service tests | Kamil Trzcinski | 2015-09-29 | 3 | -8/+11 |
| * | | | Revert check_enable_flag! changes | Kamil Trzcinski | 2015-09-29 | 1 | -4/+4 |