Commit Graph
6731 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d43d7471c1 Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhq 2013-10-12 05:06:19 +00:00
Marin Jankovski ad3defa3c2 Skip relative links render in help page. 2013-10-11 21:41:33 +02:00
Dmitriy Zaporozhets f81532b5b9 Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:02:30 +00:00
Dmitriy Zaporozhets b883d94f96 Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:00:05 +00:00
Marin Jankovski f40e0171db Test if markdown is rendered properly. 2013-10-11 13:44:00 +02:00
Sytse Sijbrandij 39c78b71c1 Add information about admin. 2013-10-11 12:15:18 +02:00
Dmitriy Zaporozhets 10fac47527 Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:38 +00:00
Dmitriy Zaporozhets 9fa94cad56 Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:12 +00:00
Sytse Sijbrandij 6cc3bb0f8f Explain how group and project permissions interact. 2013-10-11 10:40:22 +02:00
Marin Jankovski c07251887c Merge branch 'master' into relative_links_in_documentation 2013-10-11 10:00:50 +02:00
Dmitriy Zaporozhets 4123c76ec1 Merge pull request #5253 from karlhungus/feature-api-download-archive
Feature api download archive
2013-10-10 07:17:50 -07:00
Dmitriy Zaporozhets 69854c5625 Merge pull request #4736 from karlhungus/feature-create-wiki-repo-on-repo-enabled
Create a wiki when wiki_enabled:true
2013-10-10 07:17:22 -07:00
Jacob Vosmaer cb6a86ed62 Skip rather than fail empty wikis during backup 2013-10-10 16:07:39 +02:00
Izaak Alpert 72bf6a47e0 Remove file compairson
Change-Id: Id2cae87c8cd383bc6cbcbdecf0f77c161bb82eab
2013-10-10 09:19:28 -04:00
Izaak Alpert 7cad12f77f Added more tests for archive api
Change-Id: I2b0752bc2593a944d42dde0ffe0ef9ce408228a5
2013-10-10 09:19:28 -04:00
Izaak Alpert a00c534c4c Fix a bug where the tgz returned got encoded utf8
Conflicts:
	doc/api/repositories.md

Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
2013-10-10 09:19:28 -04:00
Izaak Alpert ce21d8688d feature API call to download repo archive
defaults to HEAD

Conflicts:
	spec/requests/api/repositories_spec.rb

Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
2013-10-10 09:19:28 -04:00
Izaak Alpert 0cd28156d5 Updated missed styles
Change-Id: I05e02ff7e36e2350cdf5d2b94095ada9760a204e
2013-10-10 09:17:30 -04:00
Izaak Alpert 3e71af9f7f Fix style issues
Change-Id: I1ffe18414b7f6eae38d7860a8e3b64a9a185273f
2013-10-10 09:17:30 -04:00
Izaak Alpert 9d5bb5a792 Brings this fix inline with updates to master
Change-Id: Ia50c3ac043b4c927ca59cbbdc2bba42f73e550e4
2013-10-10 09:17:30 -04:00
Izaak Alpert af1a33917a Create a wiki when wiki_enabled:true
Change-Id: I7aaab4b1f54fd2719a8a63d9069ddd5c59868e34
2013-10-10 09:17:30 -04:00
Marin Jankovski 4654999288 Merge branch 'master' into relative_links_in_documentation 2013-10-10 15:09:12 +02:00
Marin Jankovski 5b23a7bbb9 Cover a special case. 2013-10-10 14:29:16 +02:00
Marin Jankovski 5277ac1b15 Added comments and split the methods further. 2013-10-10 11:16:15 +02:00
Dmitriy Zaporozhets e8d1e827d8 Remove unnecessary tag 2013-10-10 12:14:21 +03:00
Sytse Sijbrandij b0502c20a9 Consistent naming to make difference between clicking on profile pic and profile settings clear. 2013-10-10 10:43:24 +02:00
Dmitriy Zaporozhets d1ffbdfcb6 Avoid 500 error on project page when application is close to RAM limit 2013-10-10 11:05:49 +03:00
Dmitriy Zaporozhets bd83991ac7 Use link_to_project helper 2013-10-10 10:53:49 +03:00
Dmitriy Zaporozhets 573c89e624 Improve Profile#account page UI 2013-10-10 10:30:07 +03:00
Dmitriy Zaporozhets 1935b494f6 Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq 2013-10-10 04:58:17 +00:00
Dmitriy Zaporozhets f89a74718a Merge branch 'feature/devise_email_async' of /home/git/repositories/gitlab/gitlabhq 2013-10-09 16:36:51 +00:00
Dmitriy Zaporozhets dd68e37db3 Fix profile specs 2013-10-09 19:03:09 +03:00
Jacob Vosmaer 461abaa843 Add GollumWiki#empty? method 2013-10-09 17:17:52 +02:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets 92768844cf Reverted accidently removed registration module 2013-10-09 13:52:03 +00:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets c41e66db52 Separate page for password change 2013-10-09 16:43:11 +03:00
Dmitriy Zaporozhets 7af1bc3b88 Merge branch 'feature/api_remove_project' of /home/git/repositories/gitlab/gitlabhq 2013-10-09 13:22:37 +00:00
Marin Jankovski 7dbbb6defe Rename method to avoid clashes. 2013-10-09 15:01:02 +02:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Dmitriy Zaporozhets 51825e434e API: docs for remove project 2013-10-09 14:43:18 +03:00
Dmitriy Zaporozhets 4416be54a9 API: specs for remove project 2013-10-09 14:41:54 +03:00
Dmitriy Zaporozhets c8e7d6df79 API: new feature - remove project[D 2013-10-09 14:41:41 +03:00
Marin Jankovski 70f828cd4b Split. 2013-10-09 13:28:25 +02:00
Dmitriy Zaporozhets 551fa4c9d0 Remove test case that cause Mysql Deadlock 2013-10-09 14:19:38 +03:00
Dmitriy Zaporozhets a37b8ab2b2 Merge pull request #5291 from astratto/title_issue_trackers
Use proper titles for issues trackers
2013-10-09 04:10:09 -07:00
Dmitriy Zaporozhets 87ffd67617 Improve Profile settings UI 2013-10-09 12:30:49 +03:00
Dmitriy Zaporozhets 3fb1042d77 Merge pull request #5281 from Popl7/upload_avatar_to_gitlab
avatar upload on profile page
2013-10-09 02:19:29 -07:00
Marin Jankovski 1eabd9dfec Merge branch 'master' into relative_links_in_documentation 2013-10-09 11:07:45 +02:00