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 'fix-issue-2593' into 'master' Robert Speicher
Fix Error 500 when comparing non-existing branches Closes #2593 See merge request !1355
2015-09-21Remove milestones from merge requests when milestones are deletedStan Hu
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
2015-09-18Fix Error 500 when comparing non-existing branchesStan Hu
Closes #2593
2015-09-18remove API calls from CE to CIValery Sizov
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-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-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-15Merge pull request #9138 from liyakun/masterStan Hu
add "replace" and "upload" functionality
2015-09-15 Add "Replace" and "Upload" featuresliyakun
Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
2015-09-14Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets
Import forked repositories asynchronously to prevent large repositories from timing out Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former. One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked. * Closes #2388 * Closes #2400 See merge request !1231
2015-09-12Improve english of error messageRobert Schilling
2015-09-11Remove network from CIDmitriy 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-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
2015-09-03Create labels in new projectValery Sizov
2015-08-27Don't notify users without access to the project when they are ↵Douwe Maan
(accidentally) mentioned in a note.
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-22Create cross-reference for closing references on commits pushed to ↵Maël Valais
non-default branches. I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example). Now, there are two different contexts: - when the commits with "closing reference" are pushed to the default branch, - when the commits with "closing reference" are pushed to a non-default branch. Closes gitlab-org/gitlab-ce#2190.
2015-08-22Merge branch 'reply-by-email' into 'master'Robert Speicher
Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
2015-08-21Check permissions on target project in merge request create service.Douwe Maan
2015-08-20Merge branch 'master' into reply-by-emailDouwe Maan
2015-08-19Turn reply-by-email attachments into uploads.Douwe Maan
2015-08-14Remove unnecessary fileDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14Refactor how repository makes commit with pre/post receive hooksDmitriy Zaporozhets
2015-08-14Refactor pre/post receive commit services into one classDmitriy Zaporozhets
2015-08-14Make sure target has not changed during pre-receive hookDmitriy Zaporozhets
2015-08-13Capture pre-receive exceptionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13Implement commit transaction with pre-receive and post-receive hooks for web ↵Dmitriy Zaporozhets
editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets
This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets
This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Fix adding new file to empty repo"Dmitriy Zaporozhets
This reverts commit 27a158506e033acd7195acf91995c1574e122832. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Use rugged in web editor for base64 encoding"Dmitriy Zaporozhets
This reverts commit 541133197be098732cdc14a12aa059e21cac3d71.
2015-08-11Revert "Create activity event and execute hooks on web editor commit"Dmitriy Zaporozhets
This reverts commit 3d416f1682c5e6a6ac1ea7013f66bbd0d23b452c.
2015-08-11Revert "Make web editor work correctly after switch from satellites"Dmitriy Zaporozhets
This reverts commit 435f680b897b892103fa157d4699dbb6d9ecf758.
2015-08-11Revert "Refactor web editor"Dmitriy Zaporozhets
This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets
This reverts commit d24c40ec219d76e01e2fab5f6ebf431adae91bdd.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10Refactor Trigger post-receive hooks after commits are made by GitLabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10Trigger post-receive hoooks when commits are made by GitLabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-08Merge branch 'merge-notifs' into 'master'Robert Speicher
See merge request !1077
2015-08-06Merge branch 'master' into comment-updated-byDouwe Maan
2015-08-06Merge branch 'master' into merge-notifsDouwe Maan
2015-08-05Fix merge request creation without branch selectedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Merge branch 'master' into drop-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-31Reset correct event cacheDouwe Maan