summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoringDmitriy Zaporozhets2014-07-264-9/+9
|\
| * Moved some behaviour to one placeJeroen van Baarsen2014-07-254-9/+9
* | Tests for trending/starred pagesDmitriy Zaporozhets2014-07-261-1/+1
* | Most starred projects page for Explore areaDmitriy Zaporozhets2014-07-254-1/+24
* | Move star button to sidebar. Add counter to forks tooDmitriy Zaporozhets2014-07-247-62/+81
* | Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosant...Dmitriy Zaporozhets2014-07-2411-5/+108
|\ \
| * | Helper instead of template.Ciro Santilli2014-07-173-25/+25
| * | Fix hound.Ciro Santilli2014-07-171-1/+1
| * | Add star count, view logic, more tests.Ciro Santilli2014-07-175-7/+9
| * | Move coffee to assets/projectCiro Santilli2014-07-172-5/+5
| * | Add project stars.Ciro Santilli2014-07-1710-5/+106
| |/
* | Merge pull request #6650 from lloeki/wiki_images_attachmentsDmitriy Zaporozhets2014-07-232-3/+10
|\ \
| * | Added ability to serve files in wiki repositoryLoic Nageleisen2014-06-072-3/+10
* | | Merge branch 'new_user_password_set' into 'master'Dmitriy Zaporozhets2014-07-237-21/+20
|\ \ \
| * | | Update the note for admin user.Marin Jankovski2014-07-171-2/+2
| * | | Use a better name for token.Marin Jankovski2014-07-161-3/+3
| * | | Update specs.Marin Jankovski2014-07-161-1/+1
| * | | Do not set password expiry.Marin Jankovski2014-07-151-1/+1
| * | | Do not sent a generated password via email for admin created user.Marin Jankovski2014-07-156-18/+17
* | | | Merge pull request #7332 from sugarmo/fix-graph-log-timeoutDmitriy Zaporozhets2014-07-231-1/+1
|\ \ \ \
| * | | | Fix timeout error when preparing git graph.Steven Mok2014-07-181-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #7340 from cirosantilli/diff-contrastDmitriy Zaporozhets2014-07-231-2/+2
|\ \ \ \
| * | | | Increase diff byte highlight contrast.Ciro Santilli2014-07-211-2/+2
| |/ / /
* | | | Merge branch '7-2-dev' into 'master'Dmitriy Zaporozhets2014-07-2317-97/+228
|\ \ \ \
| * | | | Refactor explore area tests. Replaced old linksDmitriy Zaporozhets2014-07-234-9/+9
| * | | | Refactor explore areaDmitriy Zaporozhets2014-07-2313-96/+66
| * | | | Explore areaDmitriy Zaporozhets2014-07-239-19/+80
| * | | | Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-...Dmitriy Zaporozhets2014-07-224-0/+100
| |\ \ \ \
| | * | | | Added public groups area to enhance searching and exploring of projectsdreis2014-07-154-0/+100
* | | | | | Force encoding utf-8 for ruby 1.9Dmitriy Zaporozhets2014-07-231-0/+1
|/ / / / /
* | | | | Merge branch 'use_fullpath' into 'master'Dmitriy Zaporozhets2014-07-221-3/+12
|\ \ \ \ \
| * | | | | Call store_location_for once.Marin Jankovski2014-07-221-10/+12
| * | | | | If the referer is not set, use fullpath.Marin Jankovski2014-07-211-1/+8
* | | | | | Fix project default branch changeDmitriy Zaporozhets2014-07-211-1/+1
|/ / / / /
* | | | | Merge branch 'file-upload-bugfix' into 'master'Dmitriy Zaporozhets2014-07-211-1/+1
|\ \ \ \ \
| * | | | | Fixing an issue where pages with multiple dropzones can trigger multiple file...GitLab2014-07-171-1/+1
* | | | | | Merge branch 'fix/avatar_relative_url' into 'master'Dmitriy Zaporozhets2014-07-211-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Don't use URI joinDrew Blessing2014-07-071-1/+1
* | | | | | Fix user params when edit from admin areaDmitriy Zaporozhets2014-07-161-2/+4
| |/ / / / |/| | | |
* | | | | If MR commits are empty if does not mean compare failedDmitriy Zaporozhets2014-07-151-1/+1
* | | | | Merge branch 'fix-huge-mr' into 'master'Dmitriy Zaporozhets2014-07-1521-297/+335
|\ \ \ \ \
| * | | | | Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-1517-192/+165
| * | | | | Cleanup diff stats UIDmitriy Zaporozhets2014-07-152-16/+28
| * | | | | Refactor MR build processDmitriy Zaporozhets2014-07-157-116/+169
| | |_|/ / | |/| | |
* | | | | Show milestone state on group milestone show page.Marin Jankovski2014-07-151-2/+2
|/ / / /
* | | | Milestone is closed only if all milestones are closed.Marin Jankovski2014-07-141-3/+3
* | | | Merge branch 'branches_with_no_parent' into 'master'Dmitriy Zaporozhets2014-07-142-71/+78
|\ \ \ \
| * | | | Error message needs to be correct.Marin Jankovski2014-07-141-1/+1
| * | | | Branches without parent commit cannot be merged.Marin Jankovski2014-07-142-71/+78
* | | | | Merge pull request #7131 from skv-headless/per_request_rules_cachingDmitriy Zaporozhets2014-07-141-24/+26
|\ \ \ \ \ | |/ / / / |/| | | |