deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2242 commits 6 branches 43 tags 25 MiB
Commit graph

331 commits

Author SHA1 Message Date
Saito 96d4f22e53 tree view need use ascii-8bit, file name need be utf8. 2012-09-11 19:18:14 +08:00
Alex Denisov 1f240b09ed User left project event added 2012-09-10 00:27:47 +03:00
Alex Denisov a86bd87afc User joined project event added 2012-09-09 23:18:28 +03:00
randx ad3a88cfd3 Prepared for gitolite v3 2012-08-29 02:03:04 +03:00
miks 4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
Dmitriy Zaporozhets 4f8a4aa44c Merge pull request #1384 from tsigo/emoji 
Emoji!
 2012-09-06 23:05:18 -07:00
Robert Speicher bde19c061a Update failure message for UsersProject uniqueness validation 
Was "User has already been taken", is now "User already exists in
project".
 2012-09-06 16:51:28 -04:00
miks 2dc0519277 bulk access roles update/deletion added 2012-09-06 23:14:42 +03:00
Robert Speicher 2faa4bba40 Update Note#upvote? to support emoji voting 2012-09-06 15:31:25 -04:00
Nihad Abbasov 0b559cdece add validations for boolean attributes 2012-09-05 04:01:11 -07:00
Robert Speicher f06d98e907 Add SetDefaultBranchDefaultToNil migration 
default_branch now defaults to nil, not 'master'. It will be set after the first
push by discover_default_branch.
 2012-09-05 01:00:07 -04:00
Robert Speicher 8db2a59d0b Add StaticModel role, and add it to Commit model 
Instead of doing this:

    link_to(commit.id, project_commit_path(project, id: commit.id))
    Note.create(noteable_id: commit.id, noteable_type: "Commit", ...)

It lets us do this:

    link_to(commit.id, project_commit_path(project, commit))
    Note.create(noteable: commit, ...)
 2012-09-02 13:40:07 -04:00
randx d246a68a24 fix project.last_activity spec 2012-08-30 19:45:05 +03:00
Dmitriy Zaporozhets 4e47402852 Fixed project last_activity. Links color changed a bit 2012-08-30 09:09:42 +03:00
Dmitriy Zaporozhets adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets 5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
Dmitriy Zaporozhets 7ab587a477 Merge pull request #1263 from dosire/merge_base_for_merge_request 
Show only the commits that are newer in the merge request.
 2012-08-23 00:32:37 -07:00
Sytse Sijbrandij 9ec4c2d214 Show only the commits that are newer in the merge request. 2012-08-21 23:07:11 +02:00
randx f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx 366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
Jakub Jirutka 335b3ed197 fix condition in find_for_ldap_auth 2012-08-20 12:58:03 +02:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Robert Speicher f36f0dac9d Consolidate functionality shared between Issue and MergeRequest 
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.

There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
 2012-08-08 21:44:33 -04:00
Robert Speicher 7a4c958882 Add empty IssueCommonality module; include in Issue and MergeRequest 2012-08-08 21:26:56 -04:00
Jakub Jirutka ad265b9610 Adding workaround for backward compatibility with legacy LDAP users 2012-08-05 11:27:17 +02:00
gitlab system 9912770c6f make hooks respect http basic authentication 2012-08-02 09:48:46 +07:00
Jakub Jirutka fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
randx 2cf5a9efbc Better name for Project push methods module 2012-07-29 20:08:58 +03:00
randx 0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 3063af5adc BaseContext 
Controllers refactoring with contexts
Move commit compare logic to model
 2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets 3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov d9cd6269e9 System Hooks: move callback to observer 2012-07-20 01:01:29 +03:00
Dmitriy Zaporozhets 1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov f5908cef19 System Hook: implemented 2012-07-19 00:25:10 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Valeriy Sizov 65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03:00
Valeriy Sizov 3ac840ff06 Merge pull request #1100 from patthoyts/pt/ldap-no-email 
Improve handling of misconfigured LDAP accounts.
 2012-07-18 05:17:14 -07:00
Dmitriy Zaporozhets 8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
Pat Thoyts f322975c50 Improve handling of misconfigured LDAP accounts. 
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-16 23:31:28 +01:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise 
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
 2012-07-06 08:18:18 -07:00
Nihad Abbasov 6533711825 enable lockable strategy for users 2012-07-06 00:05:31 -07:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00