summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-157-24/+46
* Move project members index from `/team` to `/project_members`Douwe Maan2015-03-152-2/+2
* Remove old team scopes.Douwe Maan2015-03-153-3/+0
* Use `member` instead of `tm`.Douwe Maan2015-03-152-33/+33
* Use `project_member` instead of `team_member`.Douwe Maan2015-03-1519-105/+117
* Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-1511-45/+45
* Use pre-wrap for diff code in discussion viewVinnie Okada2015-03-141-0/+5
* Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-143-9/+9
|\
| * Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-143-9/+9
* | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-142-25/+23
|\ \ | |/ |/|
| * Improve import buttons on new project pageDmitriy Zaporozhets2015-03-142-25/+23
* | Improve compare switch buttonDmitriy Zaporozhets2015-03-141-7/+1
* | Refactor buttonsDmitriy Zaporozhets2015-03-1448-106/+92
|/
* Use sass variabled for backgroung and border colorsDmitriy Zaporozhets2015-03-139-25/+33
* Improve css for file actionsDmitriy Zaporozhets2015-03-138-36/+43
* Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets2015-03-134-7/+7
|\
| * Reuse blob object fetched by Gitlab::Git::Blame.Douwe Maan2015-03-131-2/+2
| * Everything from gitlab_git is already UTF-8.Douwe Maan2015-03-133-5/+5
* | Merge branch 'tag-branch-hooks' into 'master'Dmitriy Zaporozhets2015-03-138-44/+84
|\ \
| * | Move tag deletion to service and execute hooks and services.Douwe Maan2015-03-132-6/+47
| * | Ecevute hooks and services when branches are created/deleted through web.Douwe Maan2015-03-132-0/+5
| * | More consistent method naming.Douwe Maan2015-03-132-5/+8
| * | Use PushDataBuilder where applicable.Douwe Maan2015-03-134-27/+22
| * | Set push data object kind in PushDataBuilder.Douwe Maan2015-03-132-6/+2
| |/
* | Use custom LDAP label in LDAP signin form.Douwe Maan2015-03-132-4/+4
|/
* Merge branch 'irker-service-use-supported-events' into 'master'Drew Blessing2015-03-131-2/+8
|\
| * Make Irker service use the supported events checkStan Hu2015-03-041-2/+8
* | Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets2015-03-1229-44/+59
|\ \
| * \ Merge branch 'default-pagination' into 'master'Dmitriy Zaporozhets2015-03-1219-27/+29
| |\ \
| | * | Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-1219-27/+29
| * | | Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-128-15/+18
| |\ \ \
| | * | | Prevent database query each time we render group avatarDmitriy Zaporozhets2015-03-128-15/+18
| | |/ /
| * | | Merge branch 'replace_passwords_with_asterisk' into 'master'Marin Jankovski2015-03-122-2/+12
| |\ \ \ | | |/ / | |/| |
| | * | Show asterisks instead of password in service edit form.Marin Jankovski2015-03-122-2/+12
* | | | Implement merge requests searchDmitriy Zaporozhets2015-03-128-35/+78
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-124-3/+28
|\ \ \
| * \ \ Merge branch 'fix_email_images' into 'master'Douwe Maan2015-03-124-3/+28
| |\ \ \
| | * | | replace images in emails with inline imagesHannes Rosenögger2015-03-124-3/+28
* | | | | Merge branch 'improve-import-page' into 'master'Dmitriy Zaporozhets2015-03-126-9/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Style improvements to import pageDmitriy Zaporozhets2015-03-126-9/+56
| |/ / /
* | | | Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ \ \ \
| * | | | Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-121-1/+1
* | | | | Merge branch 'blue-theme' into 'master'Dmitriy Zaporozhets2015-03-123-0/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add blue theme to GitLabDmitriy Zaporozhets2015-03-113-0/+15
* | | | | Merge branch 'hover_toggle_sidebar'Marin Jankovski2015-03-121-3/+10
|\ \ \ \ \
| * | | | | Reverting pixel changeSabba Petri2015-02-251-1/+1
| * | | | | Fixed up app_logoSabba Petri2015-02-251-1/+1
| * | | | | Added hover stateSabba Petri2015-02-251-4/+11
* | | | | | group controller refactoringValery Sizov2015-03-123-14/+12
| |_|_|/ / |/| | | |
* | | | | Merge branch 'markdown-smb-link' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |