summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'redirect_betwee_tree_and_blob' into 'master'Dmitriy Zaporozhets2014-07-094-4/+42
|\
| * Add tests for redirects.Marin Jankovski2014-07-082-0/+27
| * Check if blob or tree and redirect to the correct one.Marin Jankovski2014-07-072-4/+15
* | Merge branch 'fix-path-regex' into 'master'Dmitriy Zaporozhets2014-07-082-1/+22
|\ \
| * | Dont allow ? in project pathDmitriy Zaporozhets2014-07-082-1/+22
|/ /
* | Merge branch 'fix-archive-corrupt' into 'master'Dmitriy Zaporozhets2014-07-081-2/+2
|\ \
| * | Bump gitlab_gitDmitriy Zaporozhets2014-07-081-2/+2
|/ /
* | Fix 500 on repo archive downloadDmitriy Zaporozhets2014-07-081-1/+1
* | Merge pull request #7152 from bhuisgen/masterDmitriy Zaporozhets2014-07-081-1/+9
|\ \
| * | Fix LDAP TLS authenticationBoris HUISGEN2014-06-191-1/+9
* | | Merge pull request #7222 from jhund/fix-5936Dmitriy Zaporozhets2014-07-082-3/+2
|\ \ \
| * | | Don't remove trailing newline when editing a file in web UI editor:Jo Hund2014-06-272-3/+2
* | | | Merge pull request #7273 from whitesheep/patch-1Dmitriy Zaporozhets2014-07-081-1/+1
|\ \ \ \
| * | | | gitlab-shellMarco Rondini2014-07-071-1/+1
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-07-075-67/+109
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'improve-email-threading' into 'master'Dmitriy Zaporozhets2014-07-075-67/+109
| |\ \ \
| | * | | Allow more mail clients to group emails by threadPierre de La Morinerie2014-07-035-67/+109
* | | | | Merge branch 'sanitize_rake_check_output' into 'master'Dmitriy Zaporozhets2014-07-074-4/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add sanitize option to documentation.Marin Jankovski2014-07-073-1/+5
| * | | | Remove duplicated calls.Marin Jankovski2014-07-071-18/+11
| * | | | Add sanitize option to gitlab check rake task.Marin Jankovski2014-07-071-3/+26
|/ / / /
* | | | Merge branch 'cleaner-help-page' into 'master'Dmitriy Zaporozhets2014-07-051-12/+12
|\ \ \ \
| * | | | Cleaner help pageDmitriy Zaporozhets2014-07-051-12/+12
|/ / / /
* | | | Improve markdown docDmitriy Zaporozhets2014-07-051-30/+16
* | | | Merge branch 'notification_when_reopened' into 'master'Dmitriy Zaporozhets2014-07-057-0/+80
|\ \ \ \
| * | | | Test if reopen notifications are sent.Marin Jankovski2014-07-032-1/+38
| * | | | Reopen mr email notification.Marin Jankovski2014-07-035-0/+28
| * | | | Notification for reopened issue.Marin Jankovski2014-07-032-0/+15
* | | | | Truncate header titleDmitriy Zaporozhets2014-07-051-8/+5
* | | | | Merge branch 'email-service-full-commit-message' into 'master'Dmitriy Zaporozhets2014-07-042-2/+6
|\ \ \ \ \
| * | | | | Show full commit message and author name for Email on push serviceDmitriy Zaporozhets2014-07-042-2/+6
|/ / / / /
* | | | | Merge pull request #7208 from MrMarvin/ce_rake_cleanup_ldap_usersDmitriy Zaporozhets2014-07-041-0/+24
|\ \ \ \ \
| * | | | | adds rake task to clean up deleted LDAP usersMarvin Frick2014-06-261-0/+24
| | |_|/ / | |/| | |
* | | | | Merge pull request #7175 from jvanbaarsen/always-call-hooksDmitriy Zaporozhets2014-07-041-1/+5
|\ \ \ \ \
| * | | | | Call every service, even if one failsJeroen van Baarsen2014-06-221-1/+5
* | | | | | Merge branch 'flash_message_after_signup' into 'master'Dmitriy Zaporozhets2014-07-041-0/+8
|\ \ \ \ \ \
| * | | | | | Redirect to sign in page after signup, this will show the correct flash message.Marin Jankovski2014-07-041-0/+8
* | | | | | | Merge branch 'improve-ci-widget-ui' into 'master'Dmitriy Zaporozhets2014-07-041-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Use normal font instead of strong for ci status widgetDmitriy Zaporozhets2014-07-041-4/+4
* | | | | | | | Merge branch 'fix-fork-branch-removal' into 'master'Dmitriy Zaporozhets2014-07-042-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Dont show 'Remove source brnach' checkbox for forkDmitriy Zaporozhets2014-07-042-2/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'group_milestones_improvements' into 'master'Dmitriy Zaporozhets2014-07-042-10/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve performance, ordering and pagination for group milestones.Marin Jankovski2014-07-042-10/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'correct_active_link' into 'master'Dmitriy Zaporozhets2014-07-041-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Use correct controller name, namespacing ignored.Marin Jankovski2014-07-041-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'fix_for_public_access_doc' into 'master'Sytse Sijbrandij2014-07-041-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Link to permissions doc using relative path.Marin Jankovski2014-07-041-2/+2
|/ / / / / /
* | | | | | Merge branch 'closed-in-search' into 'master'Dmitriy Zaporozhets2014-07-032-3/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix labels showing if issue closed on search results pageDmitriy Zaporozhets2014-07-032-3/+5
|/ / / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-07-031-0/+1
|\ \ \ \ \