Dmitriy Zaporozhets
dbcf4144ee
use simple decorate on single commits
2013-03-01 15:35:22 +02:00
Dmitriy Zaporozhets
6aead7991f
fix decorate calls on collections after draper update
2013-03-01 15:24:59 +02:00
Dmitriy Zaporozhets
e1f77b9be0
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
...
Conflicts:
Gemfile.lock
2013-02-28 17:02:20 +02:00
Andrew8xx8
bca72eac74
Default issue tracker name added to gon variables
2013-02-28 16:11:14 +04:00
Dmitriy Zaporozhets
92039dd677
Developers can merge MR if target branch is not protected
2013-02-27 20:20:31 +02:00
Dmitriy Zaporozhets
5ac5510fd6
Fix automerge detection client-side since #3056
2013-02-26 10:47:27 +02:00
Dmitriy Zaporozhets
d7b667fee2
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
...
Conflicts:
app/models/merge_request.rb
2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
5e69ad2cea
Sanitize user profile input
2013-02-25 22:51:15 +02:00
Dmitriy Zaporozhets
28da2a8bdc
Monkeypatch satellite call for merge request in tests
2013-02-21 11:44:33 +02:00
Andrew8xx8
6d68923edc
human_merge_status replaced by human_merge_status_name
2013-02-20 17:50:29 +04:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Dmitriy Zaporozhets
52028dcd2d
Merge pull request #3013 from crystax/master
...
Sort groups alphabetically on dashboard page
2013-02-19 00:51:08 -08:00
Dmitry Moskalchuk
f7ae1bce25
Syntax fix of sorting groups/users
2013-02-19 11:13:19 +04:00
Dmitriy Zaporozhets
ba937b2b3d
Dont show assigned_teams block unless any. Show count in filter
2013-02-18 21:21:24 +02:00
Dmitriy Zaporozhets
a29db26cc9
Refactor and restyle team page for project
2013-02-18 21:10:49 +02:00
Dmitriy Zaporozhets
e049e18780
Merge pull request #2991 from raphendyr/username_change_disablation
...
Add option to disable username changing
2013-02-18 09:59:24 -08:00
Dmitriy Zaporozhets
97de6f851b
Fix not-working team memebership permissions change
2013-02-18 16:40:11 +02:00
Dmitriy Zaporozhets
01a7250ba5
Add user to team he creates
2013-02-18 14:35:38 +02:00
Andrew8xx8
0b512af803
Milestone uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
Dmitry Moskalchuk
a9c1b85e08
Sort groups/namespaces by human name
2013-02-16 19:40:33 +04:00
Dmitry Moskalchuk
2a4ef0fe49
Sort groups alphabetically on dashboard page
2013-02-16 19:11:36 +04:00
Dmitriy Zaporozhets
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
Dmitriy Zaporozhets
f6cc71bc36
Per project protection
2013-02-15 09:51:21 +02:00
Dmitriy Zaporozhets
4821aa6c25
skip protection to aws3
2013-02-15 09:49:35 +02:00
Jaakko Kantojärvi
ba65f2910b
Add option to disable username changing
...
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Dmitriy Zaporozhets
ed3f44085e
Redesign Admin -> user -> show page
2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets
ddea7d1689
Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph
2013-02-12 19:02:05 +02:00
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00:00
Dmitriy Zaporozhets
806b76a168
rename scope to prevent name collision
2013-02-12 11:46:50 +02:00
Dmitriy Zaporozhets
a699ebdbcc
handle attahcment with send_file
2013-02-11 21:31:19 +02:00
Dmitriy Zaporozhets
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Marin Jankovski
1b4ba3eb99
Add user delete option.
2013-02-06 12:44:09 +01:00
Sato Hiroyuki
8ff5cf9cd5
Add search box for the commit.
2013-02-05 19:08:09 +09:00
Sato Hiroyuki
81cc1cb87b
Enable to display the commit older than 650th commit.
2013-02-05 12:42:30 +09:00
Dmitriy Zaporozhets
27d9ac0fe8
Make gitlab works with gitlab-shell
2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets
85de55a120
Dont allow gitlab be loaded in iframe
2013-02-02 20:32:13 +02:00
Dmitriy Zaporozhets
e6002bdaff
Ability to manage and remove group as owner outside of admin area
2013-02-01 19:04:11 +02:00
Sato Hiroyuki
525a8cd3e9
Switchable the main branch on network graph
2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets
6b01196fb2
Dashboard to resource
2013-01-27 12:56:20 +02:00
Dmitriy Zaporozhets
bd3b677b86
Add projects page to dashboard. Remove projects pagination on dashboard
2013-01-27 12:34:27 +02:00
Dmitriy Zaporozhets
b68bba441e
Fix projects in admin -> user -> show
2013-01-26 12:15:38 +02:00
Dmitriy Zaporozhets
0125b74b3c
Fix application crashes after #2772
2013-01-26 12:08:34 +02:00
Andrey Kumanyaev
c5cbbea82e
rewrite admin users controller (use 1 variable and find by username)
2013-01-25 22:38:24 +04:00
Andrey Kumanyaev
df64bdffdf
Update user finding (by username) in teams members (team of users) controller
2013-01-25 22:35:31 +04:00
Andrey Kumanyaev
e1679d20c7
Update user finding (by username) in teams_members (project team) controller
2013-01-25 22:34:49 +04:00
Andrey Kumanyaev
f225ff8674
Update user finding (by username) in admin teams members controller
2013-01-25 22:33:49 +04:00
Andrey Kumanyaev
6efda51cc5
fix edit project members access link and page fixes refs #2745
2013-01-25 21:20:15 +04:00
Dmitriy Zaporozhets
74e329064a
teams refactoring and cleanup pt.1
2013-01-25 16:36:14 +02:00
