Dmitriy Zaporozhets
0439387be0
Merge pull request #1567 from NARKOZ/mass-assignment
...
set activerecord whitelist_attributes to true [2]
2012-09-26 13:05:55 -07:00
Nihad Abbasov
83efcabc82
set activerecord whitelist_attributes to true
2012-09-26 11:18:35 -07:00
Nihad Abbasov
4629cc44d6
fix mass assignment error in create_from_omniauth after a6a229a
2012-09-26 11:18:25 -07:00
randx
dddb5b5de9
fix left project event
2012-09-26 21:05:04 +03:00
randx
0261b0c64c
Project activity inifinite scroll paging
2012-09-26 21:01:54 +03:00
Dmitriy Zaporozhets
16e67fd8be
Merge pull request #1364 from AlexDenisov/fix_project_access_notification
...
Project access notifications fixed
2012-09-26 07:21:54 -07:00
Marin Jankovski
a58d311262
Secure and httponly options on cookie.
2012-09-26 16:02:31 +02:00
Alex Denisov
965b6701ab
Comment removed
2012-09-26 17:01:13 +03:00
Dmitriy Zaporozhets
9270b6c3c7
Fix milestone calendar, Removed unnecessary selects from admin
2012-09-26 16:49:20 +03:00
Alex Denisov
c09d233611
Merge branch 'master' into fix_project_access_notification
2012-09-26 16:14:47 +03:00
Dmitriy Zaporozhets
3c132f2e68
Merge pull request #1561 from dosire/mass_assignment
...
Protect users projects_limit from mass assignment.
2012-09-26 05:45:16 -07:00
Dmitriy Zaporozhets
547be97ba6
Merge pull request #1560 from NARKOZ/refactoring
...
cleanup rake tasks
2012-09-26 04:21:32 -07:00
Marin Jankovski
5928388b1c
Protect users projects_limit from mass assignment.
2012-09-26 13:20:44 +02:00
Nihad Abbasov
83696b127b
cleanup rake tasks
2012-09-26 04:18:10 -07:00
Nihad Abbasov
30ee53624b
Merge pull request #1553 from jouve/simplify_controllers1
...
remove duplicate before_filter
2012-09-25 14:05:26 -07:00
Cyril
252d3a0c9d
remove duplicate before_filter
2012-09-25 22:38:11 +02:00
Dmitriy Zaporozhets
e584f14857
Merge pull request #1534 from iamntz/emoji_alignment
...
Removed float on emoji
2012-09-25 12:44:03 -07:00
Dmitriy Zaporozhets
2cc8d91dad
Merge pull request #1551 from NARKOZ/front-end
...
add auto-completion for +1, -1 emoji
2012-09-25 10:12:32 -07:00
Marin Jankovski
7284c58c5f
Don't test if invalid key is valid.
2012-09-25 16:13:24 +02:00
Marin Jankovski
012dc2278c
Valid key for deploy keys spec test.
2012-09-25 16:13:13 +02:00
Marin Jankovski
81ffb0afdd
Add valid looking key to test.
...
Conflicts:
features/steps/profile/profile_ssh_keys.rb
2012-09-25 14:11:31 +02:00
Nihad Abbasov
6df515a56d
add auto-completion for +1, -1 emoji
2012-09-25 04:56:21 -07:00
Dmitriy Zaporozhets
c3efcf7a62
Pollished push event
2012-09-25 13:15:06 +03:00
Nihad Abbasov
c3907bef59
Merge pull request #1501 from caleywoods/master
...
Update timeout comment in unicorn example config.
2012-09-24 09:05:09 -07:00
Sytse Sijbrandij
f3ce02b5c9
Reject ssh keys that break gitolite.
...
Failing test.
Working check.
2012-09-24 16:48:10 +02:00
Alex Leutgöb
0b8e956f32
Add a more verbose dashboard event feed
...
- Add project name to event title
- Push: Entry links to single commit or commits overview depending on number of pushed commits
- Push: Display first 15 commits with commit message and author and link to single commit
- Issues: Display issue description
2012-09-24 15:12:44 +02:00
Dmitriy Zaporozhets
8ec956421c
Merge pull request #1539 from NARKOZ/front-end
...
auto-complete for mentions in notes
2012-09-24 06:02:34 -07:00
Dmitriy Zaporozhets
6667f3dbf9
Colored labels for events
2012-09-24 13:33:51 +03:00
Dmitriy Zaporozhets
d23022c6f6
Working on dashboard restyle and events refactoring
2012-09-24 12:32:51 +03:00
Dmitriy Zaporozhets
a6f58b9c43
Up to v2.9.1
2012-09-24 10:45:55 +03:00
Staicu Ionut
c701507b6c
Removed float on emoji
...
-`remove comment` button will not make the text jump anymore.
2012-09-24 10:06:41 +03:00
Nihad Abbasov
9c75fcbef1
auto complete team member mentions
2012-09-23 09:52:01 -07:00
Nihad Abbasov
80bcba4ee2
install jquery-atwho-rails
2012-09-23 08:53:48 -07:00
Dmitriy Zaporozhets
923eb89c1d
Merge pull request #1528 from tsigo/resque_init
...
Consolidate Resque-related initializers
2012-09-23 02:29:13 -07:00
Robert Speicher
ad3eefdcb8
Minor grammar change
...
[ci skip]
2012-09-22 17:06:30 -04:00
Robert Speicher
6ddbee5d89
Consolidate all Resque-related initializers into "4_resque"
2012-09-22 11:26:22 -04:00
Robert Speicher
2cd0caaf73
Rename 4_resque_queues initializer to 4_resque
2012-09-22 11:20:04 -04:00
Florin Stan
6424fc715b
changed the post-receive hook in order to push the correct repository name when the name contain special characters
2012-09-21 13:02:59 -06:00
Dmitriy Zaporozhets
4afb7b7cb7
Merge pull request #1522 from NARKOZ/api
...
API clean up
2012-09-21 05:35:45 -07:00
Nihad Abbasov
bbdb2c3fef
fix links in API README
2012-09-21 05:06:36 -07:00
Nihad Abbasov
4162566e11
separate project repositories API docs
2012-09-21 05:03:50 -07:00
Nihad Abbasov
1304331589
remove commits API section from help
2012-09-21 05:00:20 -07:00
Nihad Abbasov
1bae64d7f6
whitespace
2012-09-21 04:53:13 -07:00
Nihad Abbasov
b62445813d
API: SSH keys belong to user entity
2012-09-21 04:49:28 -07:00
Nihad Abbasov
4a072be2d7
API: commits belong to project repository
2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets
131553627d
Merge pull request #1521 from NARKOZ/api
...
API for project team members
2012-09-21 04:19:16 -07:00
Nihad Abbasov
25b745271a
add API for project team members
2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets
10d3a30b25
APi for commits. Better api docs
2012-09-21 13:22:30 +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
49fe8fed11
Merge branch 'api'
2012-09-20 19:35:56 +03:00
