summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_public_snippets' into 'master'Marin Jankovski2014-10-241-1/+1
|\
| * fix for public snippetValery Sizov2014-10-241-1/+1
* | Merge pull request #8114 from cirosantilli/rm-global-avatar-jsRobert Schilling2014-10-233-11/+11
|\ \
| * | Only run avatar chooser Js on pages that need itCiro Santilli2014-10-213-11/+11
* | | Merge pull request #8118 from cirosantilli/user-groups-space-linkRobert Schilling2014-10-231-1/+1
|\ \ \ | |_|/ |/| |
| * | Remove whitespace link between user group avatarsCiro Santilli2014-10-211-1/+1
| |/
* | Merge branch 'fix_milestone_link' into 'master'Dmitriy Zaporozhets2014-10-221-1/+2
|\ \
| * | Fix identation.Achilleas Pipinellis2014-10-011-1/+1
| * | Fix milestone link in issue. Closes #174 (gitlab.com).Achilleas Pipinellis2014-09-291-1/+2
* | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2014-10-221-1/+1
|\ \ \
| * | | fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono"Tobias Bieniek2014-10-061-1/+1
* | | | Fix 500 error on login page if ldap enabled and sign-in disabledDmitriy Zaporozhets2014-10-221-10/+10
* | | | Merge branch 'slack_team_name' into 'master'Valery Sizov2014-10-211-1/+2
|\ \ \ \
| * | | | Use allowed slack team name.Marin Jankovski2014-10-211-1/+2
* | | | | Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-reposit...Dmitriy Zaporozhets2014-10-211-4/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused admin/projects#repository methodCiro Santilli2014-10-211-4/+0
| | |_|/ | |/| |
* | | | Merge pull request #7961 from cirosantilli/dry-log-file-namesDmitriy Zaporozhets2014-10-211-65/+22
|\ \ \ \
| * | | | Dry admin logs.Ciro Santilli2014-10-061-65/+22
* | | | | Merge pull request #8029 from cirosantilli/rm-projects-controller-filterDmitriy Zaporozhets2014-10-211-1/+0
|\ \ \ \ \
| * | | | | Remove unused filter from ProjectsControllerCiro Santilli2014-10-131-1/+0
* | | | | | Merge pull request #8028 from cirosantilli/rm-dev-toolsDmitriy Zaporozhets2014-10-211-4/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unused dev_tools helper.Ciro Santilli2014-10-131-4/+0
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-2155-215/+137
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8030 from cirosantilli/factor-authorizeDmitriy Zaporozhets2014-10-2116-26/+18
| |\ \ \ \ \
| | * | | | | Factor authorize_push! and authorize_code_access!Ciro Santilli2014-10-1316-26/+18
| | |/ / / /
| * | | | | Merge pull request #8102 from cirosantilli/use-memoized-projectDmitriy Zaporozhets2014-10-216-38/+41
| |\ \ \ \ \
| | * | | | | Use @project on controllers, don't call methodCiro Santilli2014-10-196-38/+41
| * | | | | | Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-contro...Dmitriy Zaporozhets2014-10-211-3/+1
| |\ \ \ \ \ \
| | * | | | | | Remove param[:project_id] at admin controllerCiro Santilli2014-10-191-3/+1
| | |/ / / / /
| * | | | | | Merge pull request #8113 from cirosantilli/factor-group-formsDmitriy Zaporozhets2014-10-214-28/+15
| |\ \ \ \ \ \
| | * | | | | | Factor group formsCiro Santilli2014-10-214-28/+15
| * | | | | | | Merge pull request #8097 from cirosantilli/dry-mentioned-inDmitriy Zaporozhets2014-10-212-3/+15
| |\ \ \ \ \ \ \
| | * | | | | | | DRY mentioned in magic note constantCiro Santilli2014-10-192-3/+15
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #8110 from cirosantilli/coffee-uniform-exportRobert Schilling2014-10-2127-84/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Export all coffee classes with @Ciro Santilli2014-10-2027-84/+29
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #8111 from cirosantilli/dry-group-avatar-buttonRobert Schilling2014-10-214-21/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Factor choose group avatar buttonCiro Santilli2014-10-204-21/+10
| | |/ / / / / /
| * | | | | | | Factor group tipsCiro Santilli2014-10-203-12/+8
| |/ / / / / /
* | | | | | | Prevent 500 error when filter projects with push in admin areaDmitriy Zaporozhets2014-10-201-1/+1
|/ / / / / /
* | | | | | Merge branch 'fix-group-member-remove' into 'master'Dmitriy Zaporozhets2014-10-202-2/+3
|\ \ \ \ \ \
| * | | | | | Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-202-1/+2
| * | | | | | Fix group user removal from admin areaDmitriy Zaporozhets2014-10-201-1/+1
| |/ / / / /
* | | | | | Merge pull request #7856 from cirosantilli/error-to-msgDmitriy Zaporozhets2014-10-203-8/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use :message key, not :error for File::Service.Ciro Santilli2014-10-133-8/+2
| |/ / / /
* | | | | Merge branch 'link-to-trending-projects-instead-of-all' into 'master'Dmitriy Zaporozhets2014-10-171-1/+1
|\ \ \ \ \
| * | | | | Link to trending public projects so more relevant projects are shown to new u...Sytse Sijbrandij2014-10-171-1/+1
* | | | | | Merge branch 'improve-ci-widgets' into 'master'Dmitriy Zaporozhets2014-10-171-0/+6
|\ \ \ \ \ \
| * | | | | | Improve visual detection of CI statusDmitriy Zaporozhets2014-10-171-0/+6
| |/ / / / /
* | | | | | Increase participants block marginDmitriy Zaporozhets2014-10-171-1/+1
|/ / / / /
* | | | | Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10