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-07-27Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov
Create project services on Project creation Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354 See merge request !1045
2015-07-25Create project services on Project creationRobert Speicher
2015-07-24Dynamically check `:admin_*` ability in IssuableBaseServiceRobert Speicher
Closes #2092
2015-07-23Return true/false from AutoMergeService#merge!Douwe Maan
2015-07-22Fix Remove source-branch for MRs from same projectDouwe Maan
2015-07-17Store commit count in project tableDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17Build missing cache items in background job after each pushDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-14Rename `notice_added_references` to `create_new_cross_references!`Robert Speicher
2015-07-11Fix transferring of project to another group using the API.Douwe Maan
2015-07-09Simplify Issue and MergeRequest UpdateServicesRobert Speicher
Now that those pesky task states are gone, these become a lot simpler.
2015-07-09Remove unused `task_[un]check` states from Update servicesRobert Speicher
These were left over from the old Task handling.
2015-07-06Audit log for user authenticationValery Sizov
2015-07-01Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26Change dynamic abilities to new formatDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26Rename abilities to correspond contoller/model action namesDmitriy Zaporozhets
write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24Updated merge request merged web hook to correctly fire action=merged.Adam Meily
Fixes #879 Fixes #498
2015-06-23Fix error when deleting a user who has projectsStan Hu
Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394
2015-06-22Replace remaining references to `Note.create_cross_reference_note`Robert Speicher
2015-06-16Merge branch 'fix-ext-issue-webbased-hooks' into 'master'Douwe Maan
Fix hooks for web based events with external issue references The creation of cross references for external issues (which would fail) is now prevented. This fixes a 500 error and the execution of hooks when creating a merge request or commenting on one. Fixes #1650, GH-9333. This regression might have been introduced by 8f8a8ab32bca8fdc79d7a5115eabbd015dd44c02. There is actually a TODO by @rspeicher mentioning external issues which is lost (unhandled) in a later commit. This fix is related to !766 and !804 which fix a similar issue for hooks for Git based events. See merge request !794
2015-06-15Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan
Fix post-receive errors on a push when an external issue tracker is configured ### What does this MR do? This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior. ### Why was this MR needed? When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object. GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too. ### What are the relevant issue numbers? * Closes #1700 * Closes #1720 See merge request !804
2015-06-14Fix hooks for web based events with external issue referencesDaniel Gerhardt
The creation of cross references for external issues (which would fail) is now prevented. Fixes #1650, GH-9333.
2015-06-12Fix post-receive errors on a push when an external issue tracker is configuredStan Hu
Closes #1700 Closes #1720
2015-06-09An `in_namespace` scope is already presentzenati
2015-06-05Merge branch 'refactor-web-editor' into 'master'Dmitriy Zaporozhets
Refactor web editor * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #1761 See merge request !773
2015-06-05Refactor web editorDmitriy Zaporozhets
* fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-05Show warning when a comment will add 10 or more people to the discussion.Douwe Maan
2015-06-03Skip repo removing whem remove user or groupDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
2015-06-03Fix tests and increase delay time before remove repositoryDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03Remove projects before group/user. Remove namespace directory asyncDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03Wrap group removal into serviceDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03Move repository when project is removedDmitriy Zaporozhets
Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02Make web editor work correctly after switch from satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02Remove files in web editor using ruggedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02Create activity event and execute hooks on web editor commitDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02Use rugged in web editor for base64 encodingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Fix adding new file to empty repoDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Create and edit files in web editor via ruggedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29Disable changing of the source branch in merge request update APIStan Hu
2015-05-29Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets
Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots **Edit MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) **New MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) **System note** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
2015-05-29Support editing target branch of merge requestStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-28You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets
To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-27Merge branch 'rs-to_reference' into 'master'Dmitriy Zaporozhets
Add to_reference method to referable models Now there is a single source of information for which attribute a model uses to be referenced, and its special character. See merge request !641
2015-05-27Add a note when an Issue or Merge Request's title changesRobert Speicher
2015-05-26More SystemNoteService cleanupRobert Speicher
2015-05-22Add support for Webhook note eventsStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-15Fix.Douwe Maan
2015-05-15Move stuff around a bit in NotifictionService.Douwe Maan