summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix path to /etc/default/gitlab in 8.0 update guideetc-default-gitlabJacob Vosmaer2015-09-251-1/+1
|
* Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'Dmitriy Zaporozhets2015-09-252-2/+3
|\
| * Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-252-2/+3
| | | | | | | | Closes #2692
* | Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-254-2/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where projects would appear to be stuck in the forked import state A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork were quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See: * https://github.com/pluginaweek/state_machine/issues/191 * https://github.com/shellycloud/after_commit_queue Closes #2736 See merge request !1434
| * | Use after_commit_queue to schedule import job immediatelyStan Hu2015-09-253-5/+13
| | |
| * | Fix bug where projects would appear to be stuck in the forked import stateStan Hu2015-09-252-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork was quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we should delay the worker to ensure the DB has a chance to update. Closes #2736
* | | Merge branch 'unicorn-listen-8080' into 'master' Marin Jankovski2015-09-251-0/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Make sure Unicorn listens on localhost:8080 Some installations from source run into this when upgrading to 8.0. See merge request !1435
| * | Make sure Unicorn listens on localhost:8080unicorn-listen-8080Jacob Vosmaer2015-09-251-0/+13
| | |
* | | Merge branch 'handle-bad-head' into 'master' Dmitriy Zaporozhets2015-09-251-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix Error 500 occuring with repositories that have a bad HEAD A repository could have objects but no valid HEAD, causing `project.commit` to be `nil`. See merge request !1433
| * | Fix Error 500 occuring with repositories that have a bad HEADStan Hu2015-09-241-1/+1
| |/ | | | | | | | | A repository could have objects but no valid HEAD, causing `project.commit` to be `nil`.
* | 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
| | | | |
View Lorry Controller Status