Valeriy Sizov
|
a635b9da97
|
Revert "Do not allow removal of a project owner user."
This reverts commit 927d0cc267.
|
2012-10-08 15:57:30 +03:00 |
|
|
Valeriy Sizov
|
fc3c0592db
|
Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner
Do not allow removal of a project owner user.
|
2012-10-08 05:42:47 -07:00 |
|
|
Valeriy Sizov
|
a9cce9358a
|
Merge pull request #1627 from tsigo/tree_performance
Tree performance improvements
|
2012-10-08 05:36:31 -07:00 |
|
Dmitriy Zaporozhets
|
bcdb168709
|
Fix dashboard atom feed routes
|
2012-10-08 14:17:46 +03:00 |
|
|
Dmitriy Zaporozhets
|
624abdfc72
|
Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed
Conflicts:
app/decorators/event_decorator.rb
|
2012-10-08 13:52:07 +03:00 |
|
Marin Jankovski
|
927d0cc267
|
Do not allow removal of a project owner user.
|
2012-10-08 12:41:25 +02:00 |
|
Dmitriy Zaporozhets
|
5501955d26
|
Merge pull request #1636 from dosire/consistent_issue_type_order
Reversed order of progress indication so that the text matches the progress bar.
|
2012-10-07 01:00:38 -07:00 |
|
Aaron Stone
|
7c2e67c660
|
Tiny fix to the add/edit groups form path field
|
2012-10-05 23:46:15 -07:00 |
|
joseph Borremans
|
82425cf358
|
reversed order of progress indication for visual harmony so that text matches the progress bar
|
2012-10-05 17:48:52 +02:00 |
|
Nihad Abbasov
|
72395d7f6e
|
no need to add fonts to assets path
|
2012-10-05 07:23:58 -07:00 |
|
|
Nihad Abbasov
|
317c928198
|
improve emoji checking performance
|
2012-10-05 07:23:58 -07:00 |
|
|
Valeriy Sizov
|
76c4e83193
|
Minore code-style fixes
|
2012-10-04 13:40:40 +03:00 |
|
Alex Leutgöb
|
987e351de7
|
Escape html entities in commit messages
|
2012-10-04 10:06:17 +02:00 |
|
|
Dmitriy Zaporozhets
|
d88332709c
|
Fixed group issues/mr. Also speedup project list of admin area
|
2012-10-04 10:51:35 +03:00 |
|
Robert Speicher
|
388d72e6bf
|
Add render_tree helper; simplify (speed up) tree_icon
|
2012-10-03 19:39:27 -04:00 |
|
|
Robert Speicher
|
a8fad4ff9c
|
Remove locals from tree/submodule_item, use "object" instead
|
2012-10-03 19:39:27 -04:00 |
|
|
Robert Speicher
|
37c3474f68
|
Tree.init() JS is no longer required
|
2012-10-03 19:39:27 -04:00 |
|
|
Robert Speicher
|
96b4acf5e7
|
Remove locals from tree/tree_file and just use "object" instead
|
2012-10-03 19:39:27 -04:00 |
|
|
Robert Speicher
|
b5328879f5
|
Rename tree.js to tree.js.coffee
|
2012-10-03 19:39:27 -04:00 |
|
|
randx
|
4f7bd58307
|
Bigger fonts for groups box
|
2012-10-03 19:51:14 +03:00 |
|
|
Dmitriy Zaporozhets
|
f963d37408
|
Merge pull request #1592 from jouve/devise_layout
make devise controllers use devise layout
|
2012-10-03 07:06:08 -07:00 |
|
|
Valery Sizov
|
9e80d2d4f7
|
Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq
|
2012-10-03 12:17:48 +00:00 |
|
|
Dmitriy Zaporozhets
|
c8412bc9ed
|
Dont change params hash. Use dup instead
|
2012-10-03 15:02:02 +03: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 |
|
|
Dmitriy Zaporozhets
|
224fb5770c
|
Added ability to manage groups from admin
|
2012-10-03 12:49:43 +03: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 |
|
|
Robert Speicher
|
38ca52f33b
|
Use branches.length and tags.length instead of [whatever]_count
|
2012-10-02 18:56:57 -04:00 |
|
|
randx
|
010ac2b17f
|
Added back link. cleanup group show page
|
2012-10-02 22:08:30 +03:00 |
|
|
randx
|
1b6a3dfec9
|
Move all stuff to groups controller
|
2012-10-02 20:42:15 +03:00 |
|
|
Dmitriy Zaporozhets
|
f9eda9b33a
|
Group filtering on dashboard
|
2012-10-02 19:37:53 +03: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 |
|
|
Dmitriy Zaporozhets
|
b82cb2630c
|
Use class instead id for css styles
|
2012-10-02 10:26:24 +03:00 |
|
|
Dmitriy Zaporozhets
|
69751aac32
|
Refactoring event views
|
2012-10-01 16:58:13 +03:00 |
|
|
Dmitriy Zaporozhets
|
663dd6fad6
|
Refactored events output. Added links to authors of events
|
2012-10-01 16:39:19 +03:00 |
|
Riyad Preukschas
|
f5a62835bb
|
Fix completion for per line forms
|
2012-09-30 12:07:45 +02:00 |
|
Cyril
|
236fd1e63b
|
all devise controller use devise layout
|
2012-09-29 13:06:53 +02:00 |
|
|
Dmitriy Zaporozhets
|
a79eb84289
|
commit show page styled a bit
|
2012-09-28 16:05:54 +03:00 |
|
|
randx
|
7ded8584a5
|
blue hover
|
2012-09-27 23:59:41 +03:00 |
|
|
randx
|
9cabe04368
|
tests for: Profile -> History
|
2012-09-27 23:23:11 +03:00 |
|
|
Dmitriy Zaporozhets
|
68f4b59738
|
Merge pull request #1569 from jouve/simplify_controllers2
Simplify controllers and layout handling
|
2012-09-27 12:53:01 -07:00 |
|
|
Cyril
|
be18397d82
|
rename ProjectController to ProjectResourceController
|
2012-09-27 20:59:42 +02:00 |
|
|
Robert Speicher
|
1502be325d
|
Minor doc fix
|
2012-09-27 13:12:11 -04:00 |
|
|
randx
|
308dfc36b8
|
Fix back button for tree navigation
|
2012-09-27 19:38:52 +03:00 |
|
|
randx
|
afecb250a4
|
Dont show compare link if only one commit in push
|
2012-09-27 17:13:26 +03:00 |
|
|
Cyril
|
933c5e4146
|
update new controllers
|
2012-09-27 13:44:53 +02:00 |
|
|
Cyril
|
e563e948bb
|
Merge branch 'master' into simplify_controllers2
Conflicts:
app/controllers/commits_controller.rb
app/controllers/refs_controller.rb
|
2012-09-27 12:25:52 +02: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 |
|