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
Florian Unglaub
6d6c7a17ea
Allow single-sign-on with Omniauth
2012-08-31 15:45:50 +02: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
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
miks
2dc0519277
bulk access roles update/deletion added
2012-09-06 23:14:42 +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
randx
369df86e71
Remove GITLAB_OPTS, fixed ldap user creation
2012-07-05 21:29:37 +03:00
randx
264ee0c5a1
Tabs styled. MR Get Patch
2012-07-05 01:26:23 +03:00
Dmitriy Zaporozhets
a2eda66b30
Disable issues sort. Recent issues on top. Fixed tests
2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets
9b337b8328
Epic: Gitlab configuration with default values
2012-07-02 21:51:48 +03:00
Pierre GUINOISEAU
97d74c2adc
Add configurable default for projects_limit
2012-06-29 12:57:33 +02:00
randx
335f9d6410
New Feature: Diff patch file export for commit
2012-06-28 12:51:50 +03:00
randx
19d0dc3c04
Strict first project symdol to letter
2012-06-28 00:47:12 +03:00
Dmitriy Zaporozhets
50fdb2e7df
Remove critical status from Issue. Move sort instead
2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets
1b1e77c728
Issue Labels: Edit, show, index + filter
2012-06-27 21:20:35 +03:00
Dmitriy Zaporozhets
4c1f435ab7
Merge pull request #971 from gingko/master
...
Automatic password creation..
2012-06-26 23:41:49 -07:00
Jakub Troszok
5ab1856291
Fixing requests tests.
2012-06-27 00:55:54 +02:00
Jakub Troszok
4426bc1844
Added option to automaticaly generate passwords for new users.
2012-06-26 23:59:08 +02:00
randx
88c625e3f7
Issues can be unassigned now
2012-06-26 21:47:25 +03:00
randx
6abc649590
Reannotated
2012-06-26 21:23:09 +03:00
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