summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Fix: CI token removal regression from build traceci-fixesKamil Trzcinski2015-10-011-7/+10
|
* Fix: broken git clone URL for CI runnersKamil Trzcinski2015-10-011-2/+1
|
* Delegate ci_project parameters to projectsKamil Trzcinski2015-09-302-27/+19
| | | | | | | - 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.
* Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projectsKamil Trzcinski2015-09-292-9/+3
|
* Rename commits to ci_commitsKamil Trzcinski2015-09-292-4/+10
|
* Fix testsKamil Trzcinski2015-09-292-4/+3
|
* Fix register_build_service testsKamil Trzcinski2015-09-291-0/+4
|
* Fix testsKamil Trzcinski2015-09-293-11/+24
|
* WIPKamil Trzcinski2015-09-294-20/+23
|
* WIPKamil Trzcinski2015-09-294-6/+11
|
* Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-1/+1
|\
| * Fix admin runner page -> assign all buttonDmitriy Zaporozhets2015-09-251-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-261-1/+1
|/ | | | | | default dashboard Closes #2662
* Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'Dmitriy Zaporozhets2015-09-251-2/+2
|\
| * Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-251-2/+2
| | | | | | | | Closes #2692
* | Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-251-2/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-5/+8
| |
| * Fix bug where projects would appear to be stuck in the forked import stateStan Hu2015-09-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove unneeded changeKamil Trzcinski2015-09-241-1/+2
| |
* | Get GitLabCiService token from CI projectKamil Trzcinski2015-09-241-4/+7
|/
* Merge branch 'remove-routes-helper' into 'master' Dmitriy Zaporozhets2015-09-243-8/+14
|\ | | | | | | | | | | | | | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
| * Fix CIKamil Trzcinski2015-09-221-0/+2
| |
| * Fix Slack notification URL and remove the usage of Ci::RoutesHelperKamil Trzcinski2015-09-223-8/+12
| |
* | Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-241-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup ci dashboard Part of #2594. Based on !1403 * remove rendering GitLab projects with not enabled CI on CI dashboard * remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`) * simplify the projects query for CI dashboard See merge request !1405
| * | Simplify CI projects queryDmitriy Zaporozhets2015-09-231-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Refactor Project#enable_ci methodenable-ci-on-pushDmitriy Zaporozhets2015-09-231-10/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Enable CI for gitlab when .gitlab-ci.yml is pushedDmitriy Zaporozhets2015-09-232-1/+20
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show CI status on all pages where commits list is renderedDmitriy Zaporozhets2015-09-231-0/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-211-0/+6
|\ | | | | | | | | | | | | Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
| * Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-213-4/+14
| |\
| * | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-211-0/+6
| | |
* | | Merge branch 'fix-ci-handling' into 'master' Dmitriy Zaporozhets2015-09-211-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MR handling when GitLab CI project is not present This is copy of !1371 /cc @jacobvosmaer @vsizov @dzaporozhets See merge request !1373
| * | | Fixed MR handling when GitLab CI project is not presentfix-ci-handlingKamil Trzcinski2015-09-211-2/+6
| | | |
* | | | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Revert "Fixed MR handling when GitLab CI project is not present"Kamil Trzcinski2015-09-211-6/+2
| | | | | | | | | | | | | | | | This reverts commit 3abcab779ec3015914eda5d715b4a9588445d815.
* | | | Fixed MR handling when GitLab CI project is not presentKamil Trzcinski2015-09-211-2/+6
|/ / /
* | | Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-2/+19
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
| * | Merge branch 'master' into notification-levelsPatricio Cano2015-09-1624-4/+1669
| |\ \
| * \ \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-161-10/+14
| |\ \ \
| * | | | Added Global to the drop downs and updated the label of the button to show ↵Patricio Cano2015-09-161-1/+18
| | | | | | | | | | | | | | | | | | | | the current level instead of `Notifications`
| * | | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-1/+1
| | | | |
* | | | | Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets2015-09-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail ci builds without yml Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551 See merge request !1349
| * | | | | Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski2015-09-201-1/+1
| | | | | |
* | | | | | Merge branch 'reply-by-email-diff' into 'master' Robert Speicher2015-09-211-2/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reply by email for comments on a specific line in a diff/commit. Fixes #2363. See merge request !1364
| * | | | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-201-2/+12
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-ci-link-on-project-page' into 'master' Kamil Trzciński2015-09-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 when showing project page and there's no CI project present This fixes 500 when: 1. GitLabCiService is active 2. There's no project in ci_projects table See merge request !1338
| * | | | Fix 500 when showing project page and there's no CI project presentfix-ci-link-on-project-pageKamil Trzcinski2015-09-181-1/+1
| | | | |
* | | | | Removed format validationKirilll Zaitsev2015-09-191-1/+1
|/ / / /
* | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-182-48/+14
| | | |
* | | | Merge branch 'merge_request_error' into 'master' Dmitriy Zaporozhets2015-09-183-53/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI status in the MR page https://gitlab.com/gitlab-org/gitlab-ce/issues/2587 See merge request !1347