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

373 commits

Author SHA1 Message Date
randx 679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
randx 63fe042d97 project.issues_labels method 2012-10-09 20:39:06 +03:00
Dmitriy Zaporozhets 41e53eb980 Annotated 2012-10-09 11:14:17 +03:00
Valeriy Sizov dc33f71b18 Merge pull request #1656 from zzet/refactoring 
Refactoring
 2012-10-09 01:17:38 -07:00
Dmitriy Zaporozhets 26045d7a2c Merge pull request #1596 from riyad/fix-messages-for-deleted-things 
Fix messages for deleted things on dashboard
 2012-10-08 22:27:25 -07:00
Andrey Kumanyaev df7c52489a simple refactoring 2012-10-09 04:10:04 +04:00
Valeriy Sizov 76c4e83193 Minore code-style fixes 2012-10-04 13:40:40 +03:00
Valery Sizov 9e80d2d4f7 Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq 2012-10-03 12:17:48 +00:00
Dmitriy Zaporozhets ce1b79afa9 SQL Fixes 2012-10-03 14:26:37 +03:00
Dmitriy Zaporozhets 8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Valeriy Sizov b5f9d29f55 Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite 
Reject ssh keys that break gitolite
 2012-10-03 03:18:08 -07:00
Robert Speicher 5e3be9cda0 Cache the value of safe_message 
Also, just for extra paranoia, only call safe_message once in the
decorator methods

Adds specs to make sure it still works
 2012-10-02 19:00:41 -04:00
Dmitriy Zaporozhets d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Dmitriy Zaporozhets fa3ae24ca7 Group entity. Group has many projects 2012-10-02 18:17:12 +03:00
Riyad Preukschas 93bc1ff108 Merge branch 'master' into fix-messages-for-deleted-things 2012-10-02 14:04:34 +02:00
Dmitriy Zaporozhets 663dd6fad6 Refactored events output. Added links to authors of events 2012-10-01 16:39:19 +03:00
Riyad Preukschas 2022ae69df Clarify deletion messages 2012-09-30 15:04:43 +02:00
randx 9cabe04368 tests for: Profile -> History 2012-09-27 23:23:11 +03:00
Nihad Abbasov 2088d2eba8 replace ^ and $ anchors in regexp with \A and \z respectively 
http://guides.rubyonrails.org/security.html#regular-expressions
 2012-09-27 02:56:20 -07:00
Nihad Abbasov c7a1779b22 .map -> .pluck 2012-09-27 02:55:57 -07:00
Nihad Abbasov 841e4fbd08 cosmetical cleanup of models 2012-09-27 02:05:53 -07:00
Nihad Abbasov 2a4359a572 annotate models 2012-09-27 02:05:53 -07:00
Robert Speicher afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher e33cbb9b42 Add TreeController and spec 2012-09-26 16:32:21 -04:00
Nihad Abbasov 83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
Marin Jankovski 5928388b1c Protect users projects_limit from mass assignment. 2012-09-26 13:20:44 +02:00
Sytse Sijbrandij f3ce02b5c9 Reject ssh keys that break gitolite. 
Failing test.

Working check.
 2012-09-24 16:48:10 +02:00
Dmitriy Zaporozhets 6667f3dbf9 Colored labels for events 2012-09-24 13:33:51 +03:00
Dmitriy Zaporozhets 4cc169d3ca Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty 2012-09-21 11:22:53 +03:00
randx 9159be3a50 Fix MR diff comments. Fix wiki comments loading error 2012-09-15 09:49:21 +03:00
randx caeb65b189 Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order 2012-09-15 01:02:58 +03:00
Riyad Preukschas 07eec9c66a Update Notes JS for reversed notes 2012-09-14 21:41:57 +02:00
Riyad Preukschas 6ffec9a298 Update Note to load notes in the right order 2012-09-14 21:41:56 +02:00
randx 759fb518eb fix event issue when event for left project + project removed 2012-09-14 18:46:40 +03:00
Dmitriy Zaporozhets 048d47e626 Refactorn oauth & ldap 2012-09-12 09:23:16 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +03:00
Dmitriy Zaporozhets 40eec08c99 Merge pull request #1409 from riyad/update-votes 
Update votes for issues and merge requests
 2012-09-11 23:08:19 -07:00
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
Riyad Preukschas a2a0060034 Rename Upvote role to Votes 2012-09-08 16:05:48 +02:00
Riyad Preukschas 06c1a8a9ae Make notes recognize downvotes 2012-09-08 16:05:48 +02: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
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
Florian Unglaub 0dd94cd86e DRY'ed up the user model 2012-08-31 16:44:23 +02:00
Florian Unglaub 1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00