summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure Unicorn listens on localhost:8080unicorn-listen-8080Jacob Vosmaer2015-09-251-0/+13
|
* Merge branch 'hook-api-updates' into 'master' Stan Hu2015-09-245-4/+38
|\ | | | | | | | | | | | | Hook api updates See merge request !1429
| * hooks: improve tests for hook APIBen Boeckel2015-09-242-1/+27
| |
| * api: add enable_ssl_verification to PUT/POST hooksBen Boeckel2015-09-242-2/+6
| |
| * doc: list note_events as a valid parameter for PUT/POST hooksBen Boeckel2015-09-241-0/+2
| |
| * api: expose note_events and enable_ssl_verification for hooksBen Boeckel2015-09-242-1/+3
| |
* | Merge branch 'get-ci-token-from-ci-projects' into 'master' Robert Speicher2015-09-244-5/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | Get CI token from ci projects This fixes problem when GitLabCiService had different token than stored in Ci::Project. See merge request !1425
| * | Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projectsKamil Trzcinski2015-09-241-1/+4
| | |
| * | Update stub syntaxRobert Speicher2015-09-241-1/+1
| | |
| * | Fix grack auth specKamil Trzcinski2015-09-241-1/+1
| | |
| * | Fix specsKamil Trzcinski2015-09-242-2/+2
| | |
| * | Remove unneeded changeKamil Trzcinski2015-09-241-1/+2
| | |
| * | Get GitLabCiService token from CI projectKamil Trzcinski2015-09-241-4/+7
| | |
* | | Merge pull request #9664 from fantasywind/patch-1Robert Schilling2015-09-241-0/+1
|\ \ \ | | | | | | | | Update 7.14-to-8.0.md
| * | | Update 7.14-to-8.0.mdChia Yu Pai2015-09-241-0/+1
| | | | | | | | | | | | Add missing path change back
* | | | Merge branch 'update-mailroom' into 'master' Robert Speicher2015-09-245-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mailroom to 0.5.2 Fixes #2698 and #2711. See merge request !1424
| * | | | Update changelogupdate-mailroomDouwe Maan2015-09-241-0/+2
| | | | |
| * | | | Add and document option to use StartTLS with mail_room.Douwe Maan2015-09-242-0/+6
| | | | |
| * | | | Update mail_roomDouwe Maan2015-09-242-3/+3
| | |/ / | |/| |
* | | | Merge branch 'newrelic-grape' into 'master' Robert Speicher2015-09-242-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the newrelic-grape gem This allows us to see a breakdown of API requests in New Relic. See merge request !1419
| * | | | Add the newrelic-grape gemnewrelic-grapeJacob Vosmaer2015-09-242-3/+5
| | | | | | | | | | | | | | | | | | | | This allows us to see a breakdown of API requests in New Relic.
* | | | | Merge branch 'fix-default-avatar-in-network-graph' into 'master' Robert Speicher2015-09-242-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix default avatar not showing up in network graph The change in 71cdb24990b removed the `/assets` path in the default avatar to eliminate runtime errors, but this was one place where `image_path` was missed. If the user full URL is specified, `image_path` does nothing. Closes https://github.com/gitlabhq/gitlabhq/issues/9657 See merge request !1411
| * | | | | Fix default avatar not showing up in network graphStan Hu2015-09-242-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9657
* | | | | Merge branch 'rs-troubleshooting' into 'master' Robert Speicher2015-09-242-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Troubleshooting section to 8.0 docs [ci skip] See merge request !1416
| * | | | | Update Troubleshooting sectionsRobert Speicher2015-09-242-7/+8
| | | | | |
| * | | | | Add Troubleshooting section to 7.14 to 8.0 Update guiders-troubleshootingRobert Speicher2015-09-231-0/+9
| | | | | |
| * | | | | Add Troubleshooting section to Install guideRobert Speicher2015-09-231-0/+10
| | | | | |
* | | | | | Merge branch 'reference-apache-templates-8.0' into 'master' Robert Speicher2015-09-241-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refer to Apache templates in 8.0 update guide [ci skip] See merge request !1426
| * | | | | Refer to Apache templates in 8.0 update guidereference-apache-templates-8.0Jacob Vosmaer2015-09-241-0/+2
|/ / / / /
* | | | | Merge branch 'remove-ci-dashboard' into 'master' Douwe Maan2015-09-2410-96/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CI dashboard With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1422
| * | | | Remove CI dashboardDmitriy Zaporozhets2015-09-2410-96/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'ci-status-projects-page' into 'master' Dmitriy Zaporozhets2015-09-249-10/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show CI status on Your projects page and Starred projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 Screenshot: ![Screenshot_2015-09-24_13.42.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0516ea02b72457a431bd72d3f6619dfe/Screenshot_2015-09-24_13.42.52.png) See merge request !1420
| * | | | Show CI status on Your projects page and Starred projects pageci-status-projects-pageDmitriy Zaporozhets2015-09-249-10/+39
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'fix-markdown-preview-font' into 'master' Dmitriy Zaporozhets2015-09-242-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard Markdown font in Markdown preview instead of fixed-width font Closes #2585 See merge request !1414
| * | | | Use standard Markdown font in Markdown preview instead of fixed-width fontStan Hu2015-09-232-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #2585
* | | | | Merge branch 'build-status-on-commit-page' into 'master' Dmitriy Zaporozhets2015-09-247-34/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build status on commit page Screenshot: ![Screenshot_2015-09-24_11.29.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/49d1b9dc60d328dceaf771b5e44726ca/Screenshot_2015-09-24_11.29.54.png) Part of #2594 See merge request !1418
| * | | | | Show CI status on commit pagebuild-status-on-commit-pageDmitriy Zaporozhets2015-09-243-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Show CI status on commit pageDmitriy Zaporozhets2015-09-242-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Refactor ci-status badge cssDmitriy Zaporozhets2015-09-242-34/+37
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'remove-routes-helper' into 'master' Dmitriy Zaporozhets2015-09-245-39/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
| * | | | Fix GitlabCiService specsremove-routes-helperKamil Trzcinski2015-09-221-2/+2
| | | | |
| * | | | Fix CIKamil Trzcinski2015-09-221-0/+2
| | | | |
| * | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelperKamil Trzcinski2015-09-224-37/+12
| | | | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-2421-91/+151
|\ \ \ \ \
| * \ \ \ \ Merge branch 'move-ci-charts' into 'master' Dmitriy Zaporozhets2015-09-2416-69/+78
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI charts to project graphs area Part of #2594 Should be merged after !1405 Same page but moved to another place ![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png) See merge request !1407
| | * | | | | Check for CI enabled in correct placeDmitriy Zaporozhets2015-09-242-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Add header for ci graphs and check that it is enabledDmitriy Zaporozhets2015-09-242-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Merge branch 'master' into move-ci-chartsDmitriy Zaporozhets2015-09-2420-91/+160
| | |\ \ \ \ \
| | * | | | | | Update CHANGELOGmove-ci-chartsDmitriy Zaporozhets2015-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-2314-69/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status