Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update project last_activity_at on creation | Dmitriy Zaporozhets | 2013-08-15 | 1 | -0/+2 |
| | |||||
* | Fix passign full user object instead of id to Event.create | Dmitriy Zaporozhets | 2013-08-14 | 2 | -2/+2 |
| | |||||
* | Fixed bug with invalid event author for MR | Dmitriy Zaporozhets | 2013-08-14 | 1 | -2/+1 |
| | |||||
* | Fixed bug with invalid event author | Dmitriy Zaporozhets | 2013-08-14 | 1 | -5/+5 |
| | |||||
* | Repository import during project creation often return timeout for medium ↵ | Dmitriy Zaporozhets | 2013-08-12 | 1 | -8/+12 |
| | | | | | | | and large repos. So lets do it async. First create project, then import repo and create satellite with Sidekiq | ||||
* | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵ | Dmitriy Zaporozhets | 2013-07-30 | 3 | -35/+45 |
|\ | | | | | | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml | ||||
| * | Style changes from review with @randx | Izaak Alpert | 2013-07-17 | 1 | -13/+11 |
| | | | | | | | | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150 | ||||
| * | Rebase on master | Izaak Alpert | 2013-07-17 | 1 | -1/+0 |
| | | | | | | | | | | Trying to retrigger travis Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb | ||||
| * | Merge Request on forked projects | Izaak Alpert | 2013-07-17 | 3 | -35/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8 | ||||
* | | Fix typos | Johannes Schleifenbaum | 2013-07-29 | 1 | -1/+1 |
|/ | |||||
* | Update repository head when change default project branch | Dmitriy Zaporozhets | 2013-06-25 | 1 | -0/+6 |
| | |||||
* | Fix key observer | Dmitriy Zaporozhets | 2013-06-25 | 1 | -1/+1 |
| | |||||
* | Add imported boolean to project. Prevent shell from creating repo after it ↵ | Dmitriy Zaporozhets | 2013-06-14 | 1 | -8/+8 |
| | | | | was imported | ||||
* | cattr_accessor is not threadsafe! | Dmitriy Zaporozhets | 2013-06-11 | 3 | -4/+4 |
| | |||||
* | Keep namespace name/username synced with user | Dmitriy Zaporozhets | 2013-06-11 | 1 | -6/+5 |
| | |||||
* | Remove project cache before project.destroy | Dmitriy Zaporozhets | 2013-06-04 | 1 | -0/+4 |
| | |||||
* | Rename repo feature | Dmitriy Zaporozhets | 2013-05-25 | 1 | -0/+1 |
| | |||||
* | updated fork feature to use gitlab-shell for v5 of gitlab | Angus MacArthur | 2013-04-15 | 1 | -5/+7 |
| | |||||
* | Use update_column to set :last_activity_at for project | Dmitriy Zaporozhets | 2013-04-10 | 1 | -1/+1 |
| | |||||
* | Perfomance updating Project activity sort | Andrey Kumanyaev | 2013-04-03 | 1 | -0/+8 |
| | |||||
* | fix: wrong argument number | tsl0922 | 2013-04-01 | 1 | -1/+1 |
| | |||||
* | Add close issue/mr methods to Notify. Refactored Notificationservice | Dmitriy Zaporozhets | 2013-03-28 | 1 | -1/+1 |
| | |||||
* | add watchers to email recipients list. Add emails for close/merge MR | Dmitriy Zaporozhets | 2013-03-28 | 1 | -0/+6 |
| | |||||
* | refactor observers test since email logic moved to service | Dmitriy Zaporozhets | 2013-03-26 | 2 | -3/+1 |
| | |||||
* | refactor observers. Added BaseObserver with helper methods | Dmitriy Zaporozhets | 2013-03-26 | 9 | -45/+26 |
| | |||||
* | Move new_note email logic to NotificationService | Dmitriy Zaporozhets | 2013-03-26 | 2 | -34/+6 |
| | |||||
* | Use notificationService for MR reassigned | Dmitriy Zaporozhets | 2013-03-26 | 1 | -12/+3 |
| | |||||
* | use NotificationService for handle notify logic when MR created | Dmitriy Zaporozhets | 2013-03-26 | 1 | -3/+1 |
| | |||||
* | Use NotificationService for observers pt1 | Dmitriy Zaporozhets | 2013-03-26 | 3 | -17/+13 |
| | |||||
* | replace Gitolited mixin with Gitlab::ShellAdapter | Dmitriy Zaporozhets | 2013-03-21 | 1 | -1/+1 |
| | |||||
* | refactor emails a bit. Add email on ssh key creation | Dmitriy Zaporozhets | 2013-03-19 | 1 | -0/+3 |
| | |||||
* | wall comment does not create an event on dashboard any more | Dmitriy Zaporozhets | 2013-03-19 | 1 | -3/+6 |
| | |||||
* | Replace current Wiki system with Gollum Wikis. | Dan Knox | 2013-03-09 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | This commit replaces the old database backed Wiki system with the excellent Gollum git based Wiki system. The UI has been updated to allow for utilizing the extra features that Gollum provides. Specifically: * Edit page now allows you to choose the content format. * Edit page allows you to provide a commit message for the change. * History page now shows Format, Commit Message, and Commit Hash. * A new Git Access page has been added with the Wiki Repo URL. * The default page has been changed to Home from Index to match the Gollum standard. The old Wiki model has been left in tact to provide for the development of a migration script that will move all content stored in the old Wiki system into new Gollum Wikis. | ||||
* | Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq ↵ | Dmitriy Zaporozhets | 2013-03-05 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | | | into gliptak-omniauth_no_email_1 Conflicts: app/observers/user_observer.rb spec/observers/user_observer_spec.rb | ||||
| * | Don't email omniauth created users | Gabor Liptak | 2012-09-19 | 1 | -2/+3 |
| | | |||||
* | | Do not send issue status mail twice if author = assignee | Sven Pachnit | 2013-03-01 | 1 | -1/+1 |
| | | |||||
* | | Prevent duplicate merge events | Dmitriy Zaporozhets | 2013-02-27 | 1 | -0/+14 |
| | | |||||
* | | correct indentation in activity observer | Dmitriy Zaporozhets | 2013-02-25 | 2 | -15/+14 |
| | | |||||
* | | System hooks execution moved to System hook service | Andrew8xx8 | 2013-02-20 | 1 | -57/+2 |
| | | |||||
* | | A little bit of codestyle improvments | Andrew8xx8 | 2013-02-20 | 1 | -10/+9 |
| | | |||||
* | | Observer refactored to use StateMachine events | Andrew8xx8 | 2013-02-18 | 1 | -4/+12 |
| | | |||||
* | | Issue uses StateMachine now | Andrew8xx8 | 2013-02-18 | 1 | -10/+19 |
| | | |||||
* | | Merge Request uses StateMachine now | Andrew8xx8 | 2013-02-18 | 1 | -7/+12 |
| | | |||||
* | | Constants in Events looks good now | Andrew8xx8 | 2013-02-13 | 2 | -3/+3 |
| | | |||||
* | | use proper name for gitlabshell worker | Dmitriy Zaporozhets | 2013-02-11 | 2 | -4/+4 |
| | | |||||
* | | Fixed: post-receive, project remove, tests | Dmitriy Zaporozhets | 2013-02-05 | 1 | -2/+1 |
| | | |||||
* | | add remove keys from gitlab-shell by id | Dmitriy Zaporozhets | 2013-02-05 | 1 | -2/+2 |
| | | |||||
* | | Remove outdated specs and fixed key remove | Dmitriy Zaporozhets | 2013-02-05 | 1 | -0/+1 |
| | | |||||
* | | Make gitlab works with gitlab-shell | Dmitriy Zaporozhets | 2013-02-04 | 2 | -13/+15 |
| | | |||||
* | | fix app crash if author is missing | Dmitriy Zaporozhets | 2013-02-01 | 1 | -1/+3 |
| | |