summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Fix CI status in the MR pageValery Sizov2015-09-183-53/+8
| | | | |
* | | | | Allow to disable GitLab CIKamil Trzcinski2015-09-181-1/+2
|/ / / /
* | | | Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu2015-09-171-0/+6
|\ \ \ \ | | | | | | | | | | add repository field to issue hook data
| * | | | add repository field to issue hook dataJungkook Park2015-09-171-0/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | add a test for to_hook_data of issue model update CHANGELOG
* | | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-172-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
| * | | | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-152-3/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* | | | enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-171-1/+1
| |/ / |/| |
* | | Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-161-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links from GitLab to CI * link from dashboard to CI dashboard * link from project to CI project Its a fast solution for 8.0. Might be improved in later versions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1313
| * | | Add links from GitLab to CIDmitriy Zaporozhets2015-09-161-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix CI testsKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Fix ordering issueKamil Trzcinski2015-09-161-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-152-10/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * | | Add a help text to the Slack ServiceJeroen van Baarsen2015-09-151-0/+6
| |/ / | | | | | | | | | | | | | | | | | | When setting up the service I was not sure which webhook I should use, by adding this Help text I hope we can help people in the future with setting up this hook Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu2015-09-111-10/+14
| |/ | | | | | | | | | | | | | | | | timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
* | Fix: features/ci/admin/runners_spec.rbKamil Trzcinski2015-09-151-1/+1
| |
* | Fix: features/ci/runners_spec.rbKamil Trzcinski2015-09-151-0/+9
| |
* | fix specs. Stage 7Valery Sizov2015-09-152-3/+3
| |
* | Remove network from CIDmitriy Zaporozhets2015-09-112-124/+4
| |
* | Fix build features specsDmitriy Zaporozhets2015-09-111-1/+3
| |
* | fix of project creationValery Sizov2015-09-103-91/+1
| |
* | Fix commit specsDmitriy Zaporozhets2015-09-101-2/+2
| |
* | Fix some issues with ci models specsDmitriy Zaporozhets2015-09-101-2/+2
| |
* | remove gitlab_ci configValery Sizov2015-09-103-4/+4
| |
* | integration with gitlab authValery Sizov2015-09-092-31/+2
| |
* | Make rspec startDmitriy Zaporozhets2015-09-093-3/+3
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0912-80/+339
|\ \ | |/
| * Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-092-1/+16
| |\ | | | | | | | | | | | | | | | | | | | | | Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
| | * Create labels in new projectValery Sizov2015-09-031-0/+9
| | |