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

650 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
ef05423f47 Finish select2-ajax for users. Added Select2Helper for tests 2013-03-14 10:16:27 +02:00
Dmitriy Zaporozhets
10f14136f5 fix setting gon.api_token 2013-03-13 23:45:47 +02:00
Dmitriy Zaporozhets
bdcaf21ea7 Allow single/multiple user select 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets
7316055ac8 multiselect for ajax-users-select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets
bf17d976a7 add api users filter and integrate users select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets
fa9a8c3847 Remove team_member show page -> use user_path instead 2013-03-13 19:16:36 +02:00
Andrew8xx8
072883fd08 Search projects on dashboard was not worked. Fixed 2013-03-12 13:26:45 +04:00
Dmitriy Zaporozhets
96c627edd8 Merge pull request #3169 from hiroponz/refactor-network-graph 
Refactor network graph
 2013-03-10 01:00:14 -08:00
Dmitriy Zaporozhets
ca9098d898 remove last commit widget, added repo size and owner info on project home page 2013-03-07 11:14:19 +02:00
Sato Hiroyuki
e03a018d28 Refactor: rename module and class names. 
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
 2013-03-07 15:42:30 +09:00
Sato Hiroyuki
2f7f46b256 Refactor: replace "render :json = graph.to_json" to view template(show.json.erb). 
Because model shouldn't know about view logic.
 2013-03-07 15:19:32 +09:00
Dmitriy Zaporozhets
9dc46eee8e Return project description back 2013-03-06 22:56:48 +02:00
Dmitriy Zaporozhets
f22488f726 Merge pull request #3143 from Undev/state-machine-3 
State machine 3
 2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets
3a09f02e11 Merge pull request #3109 from hiroponz/improve-network-graph 
Improve network graph
 2013-03-04 23:02:27 -08:00
Andrew8xx8
0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Dmitriy Zaporozhets
907c334fe0 fix decorate call for milestone users 2013-03-02 13:23:30 +02:00
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
Sato Hiroyuki
2a687dd562 Show gravatar icon on tooltip. 2013-02-28 14:56:27 +09:00
Dmitriy Zaporozhets
92039dd677 Developers can merge MR if target branch is not protected 2013-02-27 20:20:31 +02:00
Sato Hiroyuki
d8a40d8c93 Move graph module from lib or vendor directory to app directory. 
Because not autoloading lib directory at development mode.
 2013-02-26 20:31:39 +09: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