Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix_public_snippets' into 'master' | Marin Jankovski | 2014-10-24 | 1 | -1/+1 |
|\ | |||||
| * | fix for public snippet | Valery Sizov | 2014-10-24 | 1 | -1/+1 |
* | | Merge pull request #8114 from cirosantilli/rm-global-avatar-js | Robert Schilling | 2014-10-23 | 3 | -11/+11 |
|\ \ | |||||
| * | | Only run avatar chooser Js on pages that need it | Ciro Santilli | 2014-10-21 | 3 | -11/+11 |
* | | | Merge pull request #8118 from cirosantilli/user-groups-space-link | Robert Schilling | 2014-10-23 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Remove whitespace link between user group avatars | Ciro Santilli | 2014-10-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'fix_milestone_link' into 'master' | Dmitriy Zaporozhets | 2014-10-22 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fix identation. | Achilleas Pipinellis | 2014-10-01 | 1 | -1/+1 |
| * | | Fix milestone link in issue. Closes #174 (gitlab.com). | Achilleas Pipinellis | 2014-09-29 | 1 | -1/+2 |
* | | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2014-10-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono" | Tobias Bieniek | 2014-10-06 | 1 | -1/+1 |
* | | | | Fix 500 error on login page if ldap enabled and sign-in disabled | Dmitriy Zaporozhets | 2014-10-22 | 1 | -10/+10 |
* | | | | Merge branch 'slack_team_name' into 'master' | Valery Sizov | 2014-10-21 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Use allowed slack team name. | Marin Jankovski | 2014-10-21 | 1 | -1/+2 |
* | | | | | Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-reposit... | Dmitriy Zaporozhets | 2014-10-21 | 1 | -4/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove unused admin/projects#repository method | Ciro Santilli | 2014-10-21 | 1 | -4/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7961 from cirosantilli/dry-log-file-names | Dmitriy Zaporozhets | 2014-10-21 | 1 | -65/+22 |
|\ \ \ \ | |||||
| * | | | | Dry admin logs. | Ciro Santilli | 2014-10-06 | 1 | -65/+22 |
* | | | | | Merge pull request #8029 from cirosantilli/rm-projects-controller-filter | Dmitriy Zaporozhets | 2014-10-21 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unused filter from ProjectsController | Ciro Santilli | 2014-10-13 | 1 | -1/+0 |
* | | | | | | Merge pull request #8028 from cirosantilli/rm-dev-tools | Dmitriy Zaporozhets | 2014-10-21 | 1 | -4/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Remove unused dev_tools helper. | Ciro Santilli | 2014-10-13 | 1 | -4/+0 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-21 | 55 | -215/+137 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #8030 from cirosantilli/factor-authorize | Dmitriy Zaporozhets | 2014-10-21 | 16 | -26/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | Factor authorize_push! and authorize_code_access! | Ciro Santilli | 2014-10-13 | 16 | -26/+18 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #8102 from cirosantilli/use-memoized-project | Dmitriy Zaporozhets | 2014-10-21 | 6 | -38/+41 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use @project on controllers, don't call method | Ciro Santilli | 2014-10-19 | 6 | -38/+41 |
| * | | | | | | Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-contro... | Dmitriy Zaporozhets | 2014-10-21 | 1 | -3/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove param[:project_id] at admin controller | Ciro Santilli | 2014-10-19 | 1 | -3/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #8113 from cirosantilli/factor-group-forms | Dmitriy Zaporozhets | 2014-10-21 | 4 | -28/+15 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Factor group forms | Ciro Santilli | 2014-10-21 | 4 | -28/+15 |
| * | | | | | | | Merge pull request #8097 from cirosantilli/dry-mentioned-in | Dmitriy Zaporozhets | 2014-10-21 | 2 | -3/+15 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | DRY mentioned in magic note constant | Ciro Santilli | 2014-10-19 | 2 | -3/+15 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #8110 from cirosantilli/coffee-uniform-export | Robert Schilling | 2014-10-21 | 27 | -84/+29 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Export all coffee classes with @ | Ciro Santilli | 2014-10-20 | 27 | -84/+29 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #8111 from cirosantilli/dry-group-avatar-button | Robert Schilling | 2014-10-21 | 4 | -21/+10 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Factor choose group avatar button | Ciro Santilli | 2014-10-20 | 4 | -21/+10 |
| | |/ / / / / / | |||||
| * | | | | | | | Factor group tips | Ciro Santilli | 2014-10-20 | 3 | -12/+8 |
| |/ / / / / / | |||||
* | | | | | | | Prevent 500 error when filter projects with push in admin area | Dmitriy Zaporozhets | 2014-10-20 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-group-member-remove' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 2 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add tests for remove group member feature in admin area | Dmitriy Zaporozhets | 2014-10-20 | 2 | -1/+2 |
| * | | | | | | Fix group user removal from admin area | Dmitriy Zaporozhets | 2014-10-20 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #7856 from cirosantilli/error-to-msg | Dmitriy Zaporozhets | 2014-10-20 | 3 | -8/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use :message key, not :error for File::Service. | Ciro Santilli | 2014-10-13 | 3 | -8/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'link-to-trending-projects-instead-of-all' into 'master' | Dmitriy Zaporozhets | 2014-10-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Link to trending public projects so more relevant projects are shown to new u... | Sytse Sijbrandij | 2014-10-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'improve-ci-widgets' into 'master' | Dmitriy Zaporozhets | 2014-10-17 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Improve visual detection of CI status | Dmitriy Zaporozhets | 2014-10-17 | 1 | -0/+6 |
| |/ / / / / | |||||
* | | | | | | Increase participants block margin | Dmitriy Zaporozhets | 2014-10-17 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Refactor error message a bit | Dmitriy Zaporozhets | 2014-10-17 | 1 | -2/+10 |