Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-21Merge branch 'rename-reply-by-email' into 'master' Robert Speicher
Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
2015-09-21Merge branch 'fix-ci-handling' into 'master' Dmitriy Zaporozhets
Fixed MR handling when GitLab CI project is not present This is copy of !1371 /cc @jacobvosmaer @vsizov @dzaporozhets See merge request !1373
2015-09-21Fetch merge request ref if it is missing when visit MR pageDmitriy Zaporozhets
This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-21Fixed MR handling when GitLab CI project is not presentKamil Trzcinski
2015-09-21Revert "Fixed MR handling when GitLab CI project is not present"Kamil Trzcinski
This reverts commit 3abcab779ec3015914eda5d715b4a9588445d815.
2015-09-21Fixed MR handling when GitLab CI project is not presentKamil Trzcinski
2015-09-21Merge branch 'notification-levels' into 'master' Douwe Maan
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
2015-09-21Merge branch 'master' into rename-reply-by-emailDouwe Maan
2015-09-21Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan
2015-09-21Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets
Fail ci builds without yml Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551 See merge request !1349
2015-09-21Merge branch 'reply-by-email-diff' into 'master' Robert Speicher
Fix reply by email for comments on a specific line in a diff/commit. Fixes #2363. See merge request !1364
2015-09-20Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski
2015-09-20Merge branch 'fix-ci-link-on-project-page' into 'master' Kamil Trzciński
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
2015-09-20Fix reply by email for comments on a specific line in a diff/commit.Douwe Maan
2015-09-19Removed format validationKirilll Zaitsev
2015-09-18Fix 500 when showing project page and there's no CI project presentKamil Trzcinski
2015-09-18remove API calls from CE to CIValery Sizov
2015-09-18Merge branch 'merge_request_error' into 'master' Dmitriy Zaporozhets
Fix CI status in the MR page https://gitlab.com/gitlab-org/gitlab-ce/issues/2587 See merge request !1347
2015-09-18Fix CI status in the MR pageValery Sizov
2015-09-18Allow to disable GitLab CIKamil Trzcinski
2015-09-17Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu
add repository field to issue hook data
2015-09-17Merge branch 'fix-issue-2382' into 'master'Stan Hu
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
2015-09-17enable SSL by defaultValery Sizov
2015-09-17Merge branch 'master' into notification-levelsPatricio Cano
2015-09-17Merge branch 'master' into notification-levelsPatricio Cano
2015-09-17Added Global to the drop downs and updated the label of the button to show ↵Patricio Cano
the current level instead of `Notifications`
2015-09-16add repository field to issue hook dataJungkook Park
add a test for to_hook_data of issue model update CHANGELOG
2015-09-16Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets
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
2015-09-16Add links from GitLab to CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-16Fix CI testsKamil Trzcinski
2015-09-16Fix ordering issueKamil Trzcinski
2015-09-15Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
2015-09-15Fix: features/ci/admin/runners_spec.rbKamil Trzcinski
2015-09-15Fix: features/ci/runners_spec.rbKamil Trzcinski
2015-09-15Add a help text to the Slack ServiceJeroen van Baarsen
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>
2015-09-15fix specs. Stage 7Valery Sizov
2015-09-15Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu
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
2015-09-15Notification level can now be saved from within the project view.Patricio Cano
2015-09-11Remove network from CIDmitriy Zaporozhets
2015-09-11Fix build features specsDmitriy Zaporozhets
2015-09-11Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu
timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
2015-09-10fix of project creationValery Sizov
2015-09-10Fix commit specsDmitriy Zaporozhets
2015-09-10Fix some issues with ci models specsDmitriy Zaporozhets
2015-09-10remove gitlab_ci configValery Sizov
2015-09-09integration with gitlab authValery Sizov
2015-09-09Make rspec startDmitriy Zaporozhets
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets
Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
2015-09-09FogBugz project importJared Szechy