summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix automerge detection client-side since #3056Dmitriy Zaporozhets2013-02-261-1/+1
* Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq int...Dmitriy Zaporozhets2013-02-261-1/+1
|\
| * human_merge_status replaced by human_merge_status_nameAndrew8xx82013-02-201-1/+1
* | Sanitize user profile inputDmitriy Zaporozhets2013-02-251-1/+16
* | Monkeypatch satellite call for merge request in testsDmitriy Zaporozhets2013-02-211-0/+2
|/
* Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-...Dmitriy Zaporozhets2013-02-192-4/+4
|\
| * Milestone uses StateMachine nowAndrew8xx82013-02-181-1/+1
| * Merge Request uses StateMachine nowAndrew8xx82013-02-181-1/+1
| * State renamed to merge_statusAndrew8xx82013-02-181-2/+2
* | Merge pull request #3013 from crystax/masterDmitriy Zaporozhets2013-02-191-1/+1
|\ \
| * | Syntax fix of sorting groups/usersDmitry Moskalchuk2013-02-191-1/+1
| * | Sort groups/namespaces by human nameDmitry Moskalchuk2013-02-161-1/+1
| * | Sort groups alphabetically on dashboard pageDmitry Moskalchuk2013-02-161-1/+1
| |/
* | Dont show assigned_teams block unless any. Show count in filterDmitriy Zaporozhets2013-02-181-0/+2
* | Refactor and restyle team page for projectDmitriy Zaporozhets2013-02-181-1/+3
* | Merge pull request #2991 from raphendyr/username_change_disablationDmitriy Zaporozhets2013-02-181-1/+3
|\ \
| * | Add option to disable username changingJaakko Kantojärvi2013-02-141-1/+3
* | | Fix not-working team memebership permissions changeDmitriy Zaporozhets2013-02-181-2/+7
* | | Add user to team he createsDmitriy Zaporozhets2013-02-181-2/+3
| |/ |/|
* | Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gi...Dmitriy Zaporozhets2013-02-161-0/+13
|\ \ | |/ |/|
| * Per project protectionDmitriy Zaporozhets2013-02-151-2/+8
| * skip protection to aws3Dmitriy Zaporozhets2013-02-151-1/+0
| * handle attahcment with send_fileDmitriy Zaporozhets2013-02-111-0/+8
* | Redesign Admin -> user -> show pageDmitriy Zaporozhets2013-02-131-2/+6
* | Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hir...Dmitriy Zaporozhets2013-02-121-1/+11
|\ \
| * | Add search box for the commit.Sato Hiroyuki2013-02-051-0/+10
| * | Enable to display the commit older than 650th commit.Sato Hiroyuki2013-02-051-1/+1
* | | Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-02-121-0/+11
|\ \ \
| * | | Add user delete option.Marin Jankovski2013-02-061-0/+11
| |/ /
* | | rename scope to prevent name collisionDmitriy Zaporozhets2013-02-121-1/+1
| |/ |/|
* | No gitolite in project any moreDmitriy Zaporozhets2013-02-113-7/+0
* | Make gitlab works with gitlab-shellDmitriy Zaporozhets2013-02-041-5/+0
|/
* Dont allow gitlab be loaded in iframeDmitriy Zaporozhets2013-02-021-0/+5
* Ability to manage and remove group as owner outside of admin areaDmitriy Zaporozhets2013-02-011-1/+35
* Switchable the main branch on network graphSato Hiroyuki2013-01-303-10/+20
* Dashboard to resourceDmitriy Zaporozhets2013-01-271-2/+2
* Add projects page to dashboard. Remove projects pagination on dashboardDmitriy Zaporozhets2013-01-271-15/+17
* Fix projects in admin -> user -> showDmitriy Zaporozhets2013-01-261-1/+1
* Fix application crashes after #2772Dmitriy Zaporozhets2013-01-261-6/+5
* rewrite admin users controller (use 1 variable and find by username)Andrey Kumanyaev2013-01-251-24/+20
* Update user finding (by username) in teams members (team of users) controllerAndrey Kumanyaev2013-01-251-1/+1
* Update user finding (by username) in teams_members (project team) controllerAndrey Kumanyaev2013-01-251-2/+2
* Update user finding (by username) in admin teams members controllerAndrey Kumanyaev2013-01-251-1/+1
* fix edit project members access link and page fixes refs #2745Andrey Kumanyaev2013-01-252-2/+2
* teams refactoring and cleanup pt.1Dmitriy Zaporozhets2013-01-251-10/+0
* Fix redirects. Add link to new team and new groupDmitriy Zaporozhets2013-01-252-2/+2
* Fix security issues with teamsDmitriy Zaporozhets2013-01-252-7/+4
* Fix mass-assignment. Dont allow users w/o access to create teamDmitriy Zaporozhets2013-01-252-7/+8
* Fix project adding to teamDmitriy Zaporozhets2013-01-251-1/+1
* allow/deny user to create group/teamDmitriy Zaporozhets2013-01-251-0/+5
View Lorry Controller Status