Commit graph

317 commits

Author SHA1 Message Date
Jakub Troszok 56dbfd2af3 Implementing automatic password generation. 2012-06-24 22:38:29 +02:00
Jakub Troszok 9132d309ad Implementing automatic password creation. 2012-06-24 22:26:13 +02:00
randx 6d92aa6d12 Fix IssueObserver current_user assign. Refactored observers 2012-06-24 10:01:42 +03:00
randx 55f8338502 Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer 2012-06-24 09:33:22 +03:00
randx 1903f6ade0 admin area -> search for users 2012-06-21 19:05:09 +03:00
Dmitriy Zaporozhets 75cf927d3b Issues & MR legend 2012-06-21 08:29:53 +03:00
Robb Kidd 65989141dc Protect IssueObserver#send_reassigned_email method. 2012-06-20 21:23:05 -04:00
Robb Kidd 70c6b48ebc Remove :issue from MailerObserver; handled by IssueObserver now.
:issue snuck back in during rebasing.
2012-06-20 14:09:46 -04:00
Robb Kidd eba61c111d Remove upvotes method from Issue.
Must have snuck in during one of the multiple rebases while observers were
being refactored.
2012-06-20 14:09:46 -04:00
Robb Kidd 88964132ed Extract observation of User to a UserObserver 2012-06-20 14:09:46 -04:00
Robb Kidd 97ca4f5dda Deliver issue mails.
It helps to actually deliver messages.
2012-06-20 14:09:46 -04:00
Robb Kidd 6617eaaf9b Make IssueObserver handle issus, not MailerObserver 2012-06-20 14:09:46 -04:00
Robb Kidd 356430c3c0 Add method for an issue to know whether it is being closed
Update IssueObserver to create a Note on the issue its being closed.
2012-06-20 14:09:46 -04:00
Robb Kidd 02924de3e1 Add method to Note to create notes about status changes. 2012-06-20 14:09:46 -04:00
Robb Kidd 00ec81eacb Update IssueObserver to send reassigned emails when an issue is reassigned. 2012-06-20 14:09:46 -04:00
Robb Kidd 2416e3cb19 Add new utility method for an issue to know whether it is being reassigned 2012-06-20 14:09:46 -04:00
Robb Kidd f6035552e5 New IssueObserver class and spec.
Handles emails for new issues and reassigned issues.
Need to add creating a Note on Issue close.
2012-06-20 14:09:46 -04:00
Dmitriy Zaporozhets a78908c697 mailObserver quickfix 2012-06-14 12:45:22 +03:00
Dmitriy Zaporozhets 72b9c14ebc refactored mail observer 2012-06-14 08:24:10 +03:00
Dmitriy Zaporozhets a6dad85d2f Get rid of modularity gem, Styled 'nothing here' message 2012-06-11 13:55:38 +03:00
Dmitriy Zaporozhets 0a70aca3b1 Models Refactoring: Move methods to roles 2012-06-07 15:44:57 +03:00
Zevs d6ed9920d6 #888 prevent to remove source_branch 2012-06-05 00:11:07 +03:00
Zevs 3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Nihad Abbasov faa0ec7c63 cleanup User model 2012-05-29 17:13:41 +05:00
randx 3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets 1b2068eaa9 Gem updates & githost logger
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
2012-05-21 23:17:41 +03:00
Demelziraptor e5bbefc980 change find_or_first to work with default branch 2012-05-16 14:47:59 +01:00
Robb Kidd 991d23e216 Change calls to Notify methods to send IDs instead of objects. 2012-05-15 22:37:34 -04:00
Robb Kidd 2d124d9496 Add delegate for project's name on Note. 2012-05-15 22:37:34 -04:00
Robb Kidd bb22360d1a Make Notify#note_merge_request_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd dd921053c8 Rename changed_issue_email to reassigned_issue_email & make resque friendly
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.

Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:35:53 -04:00
Robb Kidd 345f176a74 Update new_user_email to take id for User and perform find itself. 2012-05-15 22:35:53 -04:00
Wouter D'Haeseleer c808295e9e Allow short project names
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
2012-05-03 12:53:24 +02:00
Valeriy Sizov f72a5d11bd Merge pull request #732 from mmozuras/ldap_name_utf8
Force utf-8 encoding for ldap omniauth_info.name
2012-04-24 13:59:27 -07:00
gitlabhq c9af8e7579 New project page improved. User profile improved. Show issues, participant on Milestone show page. 2012-04-24 21:49:34 +03:00
mmozuras 03cc55dba6 Force utf-8 encoding for ldap omniauth_info.name 2012-04-24 10:42:30 +03:00
Valery Sizov e5f8397fd4 fast automerge: done 2012-04-22 16:14:01 +03:00
Valery Sizov dcbb875c46 fast automerge: base implementation 2012-04-22 15:19:09 +03:00
Dmitriy Zaporozhets 08994f3f60 Merge remote-tracking branch 'origin/merge_button'
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets 9c76bd9540 Project linguist integration 2012-04-21 01:26:22 +03:00
Dmitriy Zaporozhets 60bf502bf1 Merge pull request #698 from Sindacious/master
Display Milestones without a due date as active
2012-04-20 00:53:20 -07:00
Dmitriy Zaporozhets 1845429268 Use try for commit prev_commit_id detection 2012-04-19 23:35:35 +03:00
James Newton 69fd4763d2 display milestones that are not marked with a due date as active 2012-04-19 13:24:02 -05:00
Dmitriy Zaporozhets 3250a024ef 1. Improved admin -> new project form
2. Fixed bug: post-receive file was not added when create project via admin
2012-04-17 20:27:18 +03:00
Dmitriy Zaporozhets c9def945d4 User blocking improved. Admin area styled 2012-04-16 23:33:03 +03:00
Valery Sizov 8269a3a735 Auto-merge: checking via AJAX 2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets c0df0cd70c Commit header improved. finalize PR 667 2012-04-16 01:10:09 +03:00
Dmitriy Zaporozhets a7ed8276d7 Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers 2012-04-15 21:01:35 +03:00
Arthur Schreiber c530543c1a Nicer commit headers. 2012-04-14 12:38:12 +02:00
Dmitriy Zaporozhets 5f31989a05 Search improved 2012-04-14 11:16:11 +03:00
Dmitriy Zaporozhets b7558a2063 Removed encoding monkey patch 2012-04-11 23:03:56 +03:00
Dmitriy Zaporozhets 23d950855d Milestone basic scaffold 2012-04-09 00:28:58 +03:00
randx 897da534fa Fix issues with push 600+ commits. refactored, improved push events 2012-04-04 07:39:04 +03:00
randx eb2c1cd2e3 rollback to yaml 2012-04-04 02:59:58 +03:00
randx 911ce0d3e5 reverted event data 2012-04-04 02:59:58 +03:00
randx 82c8c42aee Move all serialization to marshall 2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets 11e4709fde fix compatibility with old events 2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets a951e6f8ae GitlabSerialize: cause of invalid yaml in some events we migrate to json serialization 2012-04-04 02:25:33 +03:00
Dmitriy Zaporozhets c9db6bb3f2 prevent app crash for events without git resources 2012-04-02 19:51:20 +03:00
Dmitriy Zaporozhets 00dc34e192 Events improved & refactored. Dashboard pollished 2012-04-02 00:24:45 +03:00
Dmitriy Zaporozhets f145450415 fixed mr unmergable method 2012-03-31 13:48:30 +03:00
Dmitriy Zaporozhets 90748cf724 Merge Button v1 complete 2012-03-30 20:49:34 +03:00
randx 3824f9b372 Unverify MR on every push. Ajax for MR accept. better UI 2012-03-30 08:15:04 +03:00
randx 411d84f385 Better merge handling. show if MR can be accepted or not 2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets cd74f9da91 Link for auto merge, db field for MR 2012-03-30 00:27:42 +03:00
Dmitriy Zaporozhets 8ee0993fdf Event & Wiki models specs 2012-03-28 22:53:45 +03:00
randx 88d9569a33 Project model refactored. Modularity gem 2012-03-28 10:44:51 +03:00
Valeriy Sizov 341b6d546b Merge pull request #586 from patthoyts/pt/ldap-auth-fix
Ensure LDAP provided email is always compared case-insensitively.
2012-03-27 13:09:06 -07:00
Dmitriy Zaporozhets 8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03:00
Steven Verbeek 6c40e89853 merging upstream changes 2012-03-24 00:36:54 -03:00
Dmitriy Zaporozhets 1c6df8e075 Improved profile & team member show 2012-03-24 01:01:36 +02:00
Pat Thoyts b9b65b8d4e Ensure LDAP provided email is always compared case-insensitively.
LDAP databases may store email addresses in mixed case so
ensure we only work with a lower case version to avoid missing
a valid account after LDAP login.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-03-23 14:59:54 +00:00
Dmitriy Zaporozhets 81da8e46f2 Remove button for empty repo. Last push on dashboard. Better notes count indicator for issues 2012-03-22 22:28:02 +02:00
Steven Verbeek 35d0de8f36 merging upstream changes 2012-03-19 21:57:29 -03:00
Steven Verbeek 94fd9a6e47 Added issue description. 2012-03-17 00:24:40 -03:00
Dmitriy Zaporozhets 2ec12c9bb8 Impoved merge requests show page. Minor style improvements across project 2012-03-16 01:45:46 +02:00
Dmitriy Zaporozhets 7f76d6cfee counters for dashboard panel 2012-03-16 01:31:46 +02:00
Dmitriy Zaporozhets 5d2bd5ec3a Simple search implementation 2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets 7b75f3cfd3 show who merged request 2012-03-15 23:32:00 +02:00
Dmitriy Zaporozhets 5a3f23f395 Persist Merge Request diff. Auto merge request close on push 2012-03-15 00:57:43 +02:00
Ariejan de Vroom 2d00f2dfe4 Added 'x notes' and +1 counters to issues and merge requests. Refs #549 2012-03-15 00:51:03 +02:00
Ariejan de Vroom 8d8b82127f Count +1 votes in issue notes. 2012-03-14 15:31:31 +02:00
Dmitriy Zaporozhets 3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets cd06d6edac Project model refactored 2012-03-09 21:43:46 +02:00
Dmitriy Zaporozhets 57ce7124fc Fixed invalid commit show if git history broken 2012-03-07 00:15:43 -08:00
Dmitriy Zaporozhets 94befdd502 Events improved. Open/close issue, merge request events displayed 2012-03-07 00:13:43 -08:00
Dmitriy Zaporozhets eb7bbedb20 Polishin & fixed tree switch 2012-03-06 00:29:40 +02:00
Dmitriy Zaporozhets cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets 74f8bc7298 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-06 00:16:40 +02:00
Uwe Kleinmann eac366a97b Sets correct content type on web hook execution. 2012-03-05 02:38:18 +01:00
Dmitriy Zaporozhets 0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets 9f1a5f415a Key uniq method refactored 2012-03-02 22:44:30 +02:00
Dmitriy Zaporozhets 2d162ff9ac Fix for mysql database cause key is a reserved word 2012-03-02 22:33:29 +02:00
Dmitriy Zaporozhets 5263dd4297 Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled 2012-03-01 22:43:04 +02:00
Dmitriy Zaporozhets 00028702fc design tab improved. Themes added 2012-03-01 21:23:50 +02:00
Dmitriy Zaporozhets 375ebcabfd improved activity ui 2012-03-01 20:47:57 +02:00
Dmitriy Zaporozhets c94159ab08 improved dashboard 2012-03-01 20:40:32 +02:00
Ariejan de Vroom b0ce61c4f2 Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
Added/fixed specs
Update spec/factory to allow Factory#new without opts

Conflicts:
	app/models/key.rb
2012-03-01 16:00:14 +01:00
Dmitriy Zaporozhets 1924de91c5 fixed compare for push 2012-02-29 23:34:06 +02:00
Dmitriy Zaporozhets 25bde28d13 Fixed tests. removed delegate to id 2012-02-29 23:04:09 +02:00