summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-038-11/+35
|\
| * Support configurable attachment size via Application SettingsStan Hu2015-04-028-11/+35
* | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-023-3/+12
|\ \
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i...Douwe Maan2015-03-313-3/+12
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-024-13/+107
|\ \ \
| * | | Add tests.Douwe Maan2015-03-313-7/+6
| * | | Small code cleanup.Douwe Maan2015-03-312-17/+8
| * | | Archive repositories in background worker.Douwe Maan2015-03-314-10/+114
| |/ /
* | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-025-41/+40
|\ \ \
| * | | Move files for moved namespaces.Douwe Maan2015-03-311-4/+0
| * | | Don't allow username to end in period.Douwe Maan2015-03-271-1/+1
| * | | Use more specific regexes.Douwe Maan2015-03-275-13/+13
| * | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-272-28/+31
* | | | Check symlink mode as a String for file_type_icon_classRobert Speicher2015-04-011-1/+1
| |_|/ |/| |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-3115-81/+88
|\ \ \
| * \ \ Merge branch 'rs-issue-1340' into 'master'Dmitriy Zaporozhets2015-04-012-12/+4
| |\ \ \
| | * | | Unbind task item checkbox events and then rebind themRobert Speicher2015-03-312-12/+4
| | | |/ | | |/|
| * | | Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-012-6/+14
| |\ \ \
| | * | | Don't leak private group existence by redirecting from namespace controller t...Douwe Maan2015-03-242-6/+14
| * | | | Merge branch 'admin-user-projects' into 'master'Dmitriy Zaporozhets2015-04-013-5/+7
| |\ \ \ \
| | * | | | Fix admin user projects lists.admin-user-projectsDouwe Maan2015-03-313-5/+7
| | |/ / /
| * | | | Merge branch 'refactor-milestones' into 'master'Dmitriy Zaporozhets2015-04-017-57/+62
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Better looking milestone listsDmitriy Zaporozhets2015-04-017-57/+62
| * | | | Merge branch 'file-commit-list' into 'master'Douwe Maan2015-03-311-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed issue where only 25 commits would load in file listingsPhil Hughes2015-03-301-1/+1
* | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-318-18/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-278-11/+47
| * | | | Return full URLs from GitLabIssueTrackerService.Douwe Maan2015-03-271-10/+9
| | |_|/ | |/| |
* | | | Better legend for contribution calendar pt2 :)Dmitriy Zaporozhets2015-03-311-1/+1
* | | | Better legend for contribution calendarDmitriy Zaporozhets2015-03-311-3/+3
* | | | Merge branch 'commits-count-badge' into 'master'Dmitriy Zaporozhets2015-03-301-1/+3
|\ \ \ \
| * | | | Added badge to commits tabPhil Hughes2015-03-301-1/+3
* | | | | Fix adding new members to groupDmitriy Zaporozhets2015-03-301-1/+1
| |_|/ / |/| | |
* | | | Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets2015-03-292-14/+19
* | | | Refactor star/fork buttonsDmitriy Zaporozhets2015-03-295-24/+47
* | | | Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into Sou...Dmitriy Zaporozhets2015-03-297-8/+61
|\ \ \ \
| * | | | Improve file icons rendering on treeSullivan SENECHAL2015-03-287-8/+61
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-296-46/+32
|\ \ \ \ \
| * \ \ \ \ Merge branch 'repo-buttons' into 'master'Dmitriy Zaporozhets2015-03-295-45/+24
| |\ \ \ \ \
| | * | | | | Alignment fixes for repo buttonsPhil Hughes2015-03-294-11/+18
| | * | | | | Moved download button into sidebarPhil Hughes2015-03-292-10/+9
| | * | | | | Changed button typePhil Hughes2015-03-272-3/+3
| | * | | | | Fork/Star button re-designPhil Hughes2015-03-264-44/+17
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'clear-note-form-on-succcess' into 'master'Dmitriy Zaporozhets2015-03-291-1/+8
| |\ \ \ \ \
| | * | | | | Prevent note form from being cleared when submitting failed.clear-note-form-on-succcessDouwe Maan2015-03-271-1/+8
| | | |_|/ / | | |/| | |
* | | | | | Merge pull request #9040 from tsigo/rs-refactor-nav-collapseDmitriy Zaporozhets2015-03-291-8/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Simplify toggle-nav-collapse JSRobert Speicher2015-03-271-8/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-291-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #9043 from skburgart/fix/merge-wordingRobert Schilling2015-03-281-1/+1
| |\ \ \ \
| | * | | | Change merging notification to sound more naturalSteven Burgart2015-03-271-1/+1
| | |/ / /