summaryrefslogtreecommitdiff
Commit message (Collapse)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
|\ | | | | | | | | | | | | | | | | | | | | | | CI: Fix clone url and fix project token removal - Fixes broken CI clone url on dev.gitlab.org - Fixes regression in CI token removal /cc @vsizov @dzaporozhets See merge request !1481
| * 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 page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> ## Before ![Screenshot_2015-10-01_12.20.10](https://gitlab.com/gitlab-org/gitlab-ce/uploads/dca4598ee558e13c02e31cc1b5ecab9b/Screenshot_2015-10-01_12.20.10.png) ## After ![Screenshot_2015-10-01_12.19.56](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4a07d1f4aaa1e0cde401d9d408a9976/Screenshot_2015-10-01_12.19.56.png) cc @skyruler See merge request !1483
| * | Fix UI bug introduced in new project pagefix-ui-bugDmitriy Zaporozhets2015-10-012-42/+42
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added troubleshooting to migration doc @jacobvosmaer any thoughts? See merge request !1482
| | * | | Update migration documentationKamil Trzcinski2015-10-011-0/+105
| | | | |
| * | | | Update db schemaDmitriy Zaporozhets2015-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | 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 page The previous title on the New Merge Request page would only show the group name. which could be confusing. Before, if you attempted to create a new merge request within the repo, it might look like this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d300d3a362406628ffc7c8f2b5cc6b5d/image.png) Since they are in the same repo, this MR just simplifies this to the branches: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/5d7b3efc2399b37f84ccfd42bd5d6e8d/image.png) However, if you create a MR from a forked project, you now see the full namespace: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/7998c3d19e90d405f4634202cc7181c5/image.png) Closes #2875 See merge request !1477
| | * | | | | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-305-14/+49
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous title would only show the group name, which could be confusing. Closes #2875
| * | | | | 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 move https://dev.gitlab.org/gitlab/gitlabhq/issues/2536 See merge request !1463
| | * | | | 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` Since we've updated our Devise dependency, we can take advantage of this new-ish configuration setting and avoid our hackish workaround. See merge request !1475
| | * | | 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
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Update docker guide and add docker-compose.yml /cc @JobV @sytses See merge request !1473
| | * | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes english information paragraph in admin/applications view See merge request !1470
| | * | | | 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 TCP [ci skip] See merge request !1462
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Ruby and Golang versions [ci skip] See merge request !1467
| | * | | | | | 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
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use data stored in projects instead of ci_projects - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc. /cc @dzaporozhets See merge request !1404
| | * | | | | Fix sometimes failing testsKamil Trzcinski2015-09-301-5/+5
| | | | | | |
| | * | | | | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-3012-93/+117
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.
| * | | | | Merge branch 'fix-removed-file-in-diff' into 'master' Dmitriy Zaporozhets2015-09-306-51/+70
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when removed file was not appearing in merge request diff Finally we can see removed files in merge request diff :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2533 See merge request !1471
| | * | | | | Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-302-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-304-15/+34
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup ci helpers Part of #2594 See merge request !1466
| * | | | | | Fix CI mailercleanup-ci-helpersDmitriy Zaporozhets2015-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Refactor CI helpersDmitriy Zaporozhets2015-09-2913-143/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | 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 fix crontab clearing in the CI migration guide All other commands in the guide set this env var, but it's missing for the `whenever --clear-crontab` call and this causes it to not clear the crontab properly. See merge request !1474
| * | | | | | Add a missing RAILS_ENV=production to crontab clearingDimitar Dimitrov2015-09-301-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All other commands in the guide set this env var, but it's missing here and this causes whenever not to clear the crontab file of gitab_ci properly.
* | | | | | Merge branch 'move-ci-settings' into 'master' Dmitriy Zaporozhets2015-09-3012-71/+86
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Move CI project settings page to CE project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1465
| * | | | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-2912-71/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | 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 controller If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. Fixes bug introduced by !1446. See merge request !1459
View Lorry Controller Status