summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix relative links from Help#API pageDmitriy Zaporozhets2013-10-141-1/+1
* Merge pull request #5305 from saymedia/masterDmitriy Zaporozhets2013-10-142-2/+2
|\
| * Fix the sigil for merge request emailsAbe Hassan2013-10-082-2/+2
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2013-10-143-0/+4
|\ \
| * \ Merge branch 'web_hook_project_id' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-143-0/+4
| |\ \
| | * | Include project_id in webhook payload.Marin Jankovski2013-10-143-0/+4
* | | | Remove .git from project url end redirectDmitriy Zaporozhets2013-10-141-0/+9
* | | | Added links to submodulesDmitriy Zaporozhets2013-10-143-4/+4
|/ / /
* | | Merge branch 'syshook-docs' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-141-0/+2
|\ \ \ | |/ / |/| |
| * | System hooks docs links to admin area.Sytse Sijbrandij2013-10-141-0/+2
|/ /
* | Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-142-6/+16
|\ \
| * | Use sidekiq restart rake task in init scriptJacob Vosmaer2013-10-091-3/+1
| * | Use built-in sidekiq deamonizationJacob Vosmaer2013-10-091-1/+1
| * | Remove duplicate log path generationJacob Vosmaer2013-10-091-2/+6
| * | Always shut down sidekiq before startingJacob Vosmaer2013-10-091-1/+9
* | | Merge branch 'cookies-in-redis' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-142-9/+8
|\ \ \
| * | | The cookie store is vulnerable to session replay attacks.Sytse Sijbrandij2013-10-112-9/+8
* | | | Fix README detection for subdirDmitriy Zaporozhets2013-10-131-1/+2
* | | | Improve admin dashboard UXDmitriy Zaporozhets2013-10-131-13/+18
* | | | Revert "Move warning about 0 ssh keys to bottom of page"Dmitriy Zaporozhets2013-10-131-5/+0
* | | | Move warning about 0 ssh keys to bottom of pageDmitriy Zaporozhets2013-10-131-0/+5
* | | | Lighter border color for ui-box. Show closed keyword for issues listDmitriy Zaporozhets2013-10-134-4/+6
* | | | Fix 500 error on page with submodulesDmitriy Zaporozhets2013-10-121-8/+7
* | | | Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-123-1/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Skip relative links render in help page.Marin Jankovski2013-10-113-1/+22
|/ / /
* | | Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-111-1/+3
|\ \ \
| * | | Add information about admin.Sytse Sijbrandij2013-10-111-0/+1
| * | | Explain how group and project permissions interact.Sytse Sijbrandij2013-10-111-1/+2
* | | | Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitl...Dmitriy Zaporozhets2013-10-118-6/+357
|\ \ \ \
| * | | | Test if markdown is rendered properly.Marin Jankovski2013-10-115-5/+228
| * | | | Merge branch 'master' into relative_links_in_documentationMarin Jankovski2013-10-115-2/+86
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into relative_links_in_documentationMarin Jankovski2013-10-1071-330/+467
| |\ \ \ \
| * | | | | Cover a special case.Marin Jankovski2013-10-102-11/+35
| * | | | | Added comments and split the methods further.Marin Jankovski2013-10-101-13/+46
| * | | | | Rename method to avoid clashes.Marin Jankovski2013-10-092-2/+26
| * | | | | Split.Marin Jankovski2013-10-091-7/+30
| * | | | | Merge branch 'master' into relative_links_in_documentationMarin Jankovski2013-10-0926-70/+162
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Match the brackets so we don't replace the regular text.Marin Jankovski2013-10-081-2/+2
| * | | | | Check for wiki.Marin Jankovski2013-10-082-3/+13
| * | | | | Show links with correct ref.Marin Jankovski2013-10-082-5/+6
| * | | | | Search and replace relative links in tree/readmeMarin Jankovski2013-10-082-1/+14
* | | | | | Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-113-1/+28
|\ \ \ \ \ \
| * | | | | | Skip rather than fail empty wikis during backupJacob Vosmaer2013-10-101-1/+3
| * | | | | | Add GollumWiki#empty? methodJacob Vosmaer2013-10-092-0/+25
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/reposi...Dmitriy Zaporozhets2013-10-113-4/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Consistent naming to make difference between clicking on profile pic and prof...Sytse Sijbrandij2013-10-103-4/+4
* | | | | | Merge pull request #5253 from karlhungus/feature-api-download-archiveDmitriy Zaporozhets2013-10-103-1/+54
|\ \ \ \ \ \
| * | | | | | Remove file compairsonIzaak Alpert2013-10-101-8/+0
| * | | | | | Added more tests for archive apiIzaak Alpert2013-10-101-0/+9
| * | | | | | Fix a bug where the tgz returned got encoded utf8Izaak Alpert2013-10-102-6/+10