MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-21 01:44:18 +01:00
Code Issues Releases Wiki Activity
5495 commits 17 branches 214 tags 773 MiB
Commit graph

533 commits

Author SHA1 Message Date
Unknwon
7826eae452 #3045 fix DEPRECATED Action signature erorr 2016-05-12 14:32:28 -04:00
Unknwon
60ae8ac3d2 Add route for #2846 2016-03-21 10:49:46 -04:00
Unknwon
9bd9ad4205 #1692 add CRUD issue APIs 
- Fix go-gogs-client#10
- Related to #809
 2016-03-13 23:20:22 -04:00
Unknwon
dd6faf7f9b Convert all API handers to use *context.APIContext 2016-03-13 18:49:16 -04:00
Unknwon
b4f47a7623 #1891 attempt to fix invalid csrf token 2016-03-12 20:56:03 -05:00
Unknwon
d733efc1cc #1286 #2098 Alpha support for custom templates 
No guarantee for compatibility with future changes
 2016-03-12 13:48:34 -05:00
Unknwon
f76d821bda fix #2804 2016-03-11 17:12:37 -05:00
Unknwon
2bf8494332 #13 finish user and repository search 
Both are possible on explore and admin panel
 2016-03-11 15:33:12 -05:00
Unknwon
514382e2eb Rename module: middleware -> context 2016-03-11 11:56:52 -05:00
Unknwon
58f0c68151 Some minor changes 2016-03-06 16:40:04 -05:00
Unknwon
12b5a76b0d Minor fix for #2772 2016-03-06 15:37:49 -05:00
Tamás Molnár
9c91e27933 Added: Ability to delete org avatar. 2016-03-06 17:36:30 +01:00
Unknwon
a5b0400be7 #1146 finish new access rights for collaborators 2016-03-05 20:45:23 -05:00
Unknwon
045f14fbd0 #1146 finsih UI work for access mode of collaborators 
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
 2016-03-05 18:08:42 -05:00
Unknwon
a2f13eae55 #1157 some avatar setting changes 
- Allow to delete current avatar
 2016-03-05 00:51:51 -05:00
Unknwon
2d2d85bba4 #1597 support pull requests in same repository 2016-03-04 15:43:01 -05:00
Unknwon
9df6ce48c5 Minor fixes for #2746 2016-03-04 13:32:17 -05:00
Josh Frye
2f228ddf31 Update delete wiki page route 2016-03-04 09:26:52 -05:00
Josh Frye
1ca171dbe9 Add ability to delete single wiki pages. 2016-03-04 09:26:52 -05:00
Unknwon
9e89584cb4 Allow setting git operations timeouts 
- Migrate: #2704 #2653
- Clone: #2701
- Mirror, Pull
 2016-02-29 19:29:49 -05:00
Unknwon
8055a0bdac Post work for #2637 
Improve test cases, config settings, also show SSH config settings on admin config panel.
 2016-02-27 20:48:39 -05:00
Unknwon
baaf6046a1 Minor fix for #2660 2016-02-24 23:59:17 -05:00
Josh Frye
c27038e392 Test mailer button. Addresses #1531 2016-02-24 09:48:05 -05:00
Unknwon
72ce06eab8 #2682 fix missing slash for go-get meta 2016-02-23 00:12:04 -05:00
Unknwon
912f7b51e9 #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
Unknwon
c9516c4c60 Fix wrong place to check disable SSH 2016-02-21 21:55:59 -05:00
Unknwon
ac78bae7b5 Replace uuid module with original package 2016-02-20 18:13:12 -05:00
Unknwon
7140dbac95 Fix #857 2016-02-20 15:10:34 -05:00
Unknwon
2408df3f35 Merge pull request #2663 from Download-Fritz/MirrorForks 
#2505 Allow to fork and disallow to create PRs for mirrors.
 2016-02-19 15:04:50 -05:00
Download-Fritz
a1b28fc33c Rename MustEnablePulls() to MustAllowPulls() and simplify the contained check to AllowsPulls(). 2016-02-19 20:48:32 +01:00
Unknwon
338af89d56 #2650 fix possbility that use email as pusher user name 
Remove the possibility of using email as user name when user actually push
through combination of email and password with HTTP.

Also refactor update action function to replcae tons of arguments with
single PushUpdateOptions struct.
And define the user who pushes code as pusher, therefore variable names shouldn't
be confusing any more.
 2016-02-17 22:47:06 -05:00
Unknwon
ccc94dd11c #2646 fix panic on pushing repositor 2016-02-17 15:17:52 -05:00
Unknwon
9cf4fe043b Add env var check for update 2016-02-15 23:11:22 -05:00
Unknwon
58e004f7da Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon
9adfe453d5 #2569 delete repo local copy when transfer 
Remote repository path is renamed but does not delete
outdated local copy which still has old repository path
as remote.
 2016-02-14 19:42:38 -05:00
Josh Frye
8662990746 Add default branch to repo payload 2016-02-12 11:04:46 -05:00
Josh Frye
47adc0e8f7 Bump git-module. Fixes #2589 2016-02-11 17:03:39 -05:00
Unknwon
739d5aa1d3 Merge pull request #2530 from fnkr/hide-other-teams-repos-from-org-page 
Hide other teams & repos from organization page
 2016-02-04 12:52:11 -05:00
Florian Kaiser
71bb7f6053 Escape unescaped periods in route regular expression 2016-02-02 17:39:56 +00:00
Florian Kaiser
e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Unknwon
ee814bf8d6 #2491 minor fix for sr on dashboard 2016-01-29 15:28:24 -05:00
Unknwon
db719abff2 stop compile bindata for TRANSLATORS 
- update required version of git-module for #2373
 2016-01-11 15:01:38 +08:00
Unknwon
e0f0f72a36 #2345 disallow access of some pages for empty repo 2016-01-07 11:07:17 +08:00
Unknwon
cc22c8a1ae update dep lib version requirement 2016-01-06 13:34:34 +08:00
Unknwon
a62290de52 #2311 improve HTTP auth error message 2015-12-30 21:29:30 -05:00
Unknwon
85af36332b #2282 fix utf-8 recognized as windows-1252 2015-12-25 05:25:47 -05:00
Unknwon
a49af93faf #1692 APIs: Users Followers 
- User profile un/follow
- List user's followers/following
 2015-12-21 04:24:11 -08:00
Unknwon
f00fef0cd0 #2251 show commits count in PR tabs 2015-12-19 21:09:03 -05:00
Unknwon
9cd16c5b12 #1692 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon
8ecbf0f16d fix #2204 2015-12-15 19:42:20 -05:00
Unknwon
19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon
3362b3a44f fix possible disclosure 2015-12-14 17:06:54 -05:00
Unknwon
50264200f0 fix huge diff hangs 2015-12-14 09:38:21 -05:00
Unknwon
7509fa2c33 improve get commits performance 2015-12-13 22:58:12 -05:00
Unknwon
79dcd7ee6e #2167 able to identify git version on Windows 2015-12-13 18:20:39 -05:00
Unknwon
59c965a5ec #2156 admin able to edit organization max repo creation 2015-12-11 19:24:57 -05:00
Unknwon
477b4d3b50 #2154 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon
2a0bb1fa90 #1575 Limit repo creation 2015-12-10 12:37:53 -05:00
Unknwon
9a2e43bff2 move out git module and #1573 send push hook 2015-12-09 20:46:05 -05:00
Adam Strzelecki
e4a092fb5a Make serv/update use LOCAL_ROOT_URL instead public 
The reasoning for that is in the previous commit.
 2015-12-09 23:11:07 +01:00
Unknwon
4e0c697aaf force new INI version 2015-12-07 11:33:04 -05:00
Unknwon
ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -05:00
Unknwon
404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
Unknwon
f3eaa4c592 Set default language for i18n 2015-12-05 01:20:11 -05:00
Unknwon
f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon
e538ff2770 fix #1829 and fix #890 2015-12-04 21:30:33 -05:00
Unknwon
56dd430a10 refactor API routes and some work for #976 2015-12-04 17:16:42 -05:00
Unknwon
5742f9fe69 fix #2095 2015-12-03 14:31:31 -05:00
Unknwon
cc8f5add6e fix #976 2015-12-03 00:24:37 -05:00
Unknwon
ec2423ad7c more UI minor fixes 2015-12-02 20:56:26 -05:00
Adam Strzelecki
2580e7b57e UI: Always show menu on repo pages 
Merges repo/sidebar.tmpl with repo/header.tmpl and makes every repo page use
middleware.RepoRef() necessary to display information on this menu.
 2015-12-03 02:16:18 +01:00
Unknwon
0be8b1b1a1 #2052 Ability to batch delete system notices 2015-12-01 23:33:08 -05:00
Unknwon
dcb391d341 Merge branch 'feature/wiki' into develop 2015-11-30 20:46:19 -05:00
Unknwon
830d000667 finish wiki 2015-11-30 20:45:55 -05:00
Unknwon
5a14c3cf98 Merge pull request #2053 from kakwa/develop 
various fixes in gogs dump command
 2015-11-30 16:18:18 -05:00
Unknwon
9950f5a5bd add line break after SSH error message 2015-11-30 10:00:52 -05:00
kakwa
1d7a1b6034 add name of the dump file in last log message 2015-11-28 15:22:10 +01:00
kakwa
a59b1fcc21 Fix dump of log and custom directory in dump cmd 
Now, the dump cmd uses setting.CustomPath and setting.LogRootPath
instead of setting.WorkDir which was kind of broken if the gogs
binary was in a different directory than gogs data.
Additionally, the backup of setting.CustomPath directory is only done
if it exists.
 2015-11-28 15:08:50 +01:00
kakwa
c5a9be9115 Using a tmp dir to generate db and repo dumps 
Using a tmp dir makes gogs dump more robust to concurrent runs.

It also permits an easier cleaning of the tmp files (gogs-db.sql and
gog-repo.zip) by just removing the tmp dir.

As a side effect, it partially fix bugs on workdir.
Previously, 'gogs dump' created the archives in the current directory,
and tried to include these archives from the directory where the
gogs binary lies.
ex: if gogs binary is in /usr/bin/gogs, and gogs dump is run from /tmp/,
/tmp/gog-repo.zip is created, but gogs dump tried to include
/usr/bin/gogs-repo.zip.
 2015-11-28 14:07:51 +01:00
kakwa
f86afb04a2 Adding more error handling in dump cmd 
The dump cmd did not check the return value of the z.AddFile or
z.AddDir when building the final archive.
It caused the dump command to succeed even if an error occurred.
The resulted dump archive could be corrupted/empty.
(errors could be various: removal by a concurrent process, disk full,
bugs in the dump cmd itself)
 2015-11-28 12:11:38 +01:00
Unknwon
e42fcb033d wiki: finish edit 2015-11-27 01:50:38 -05:00
Unknwon
392f3ee210 wiki: finish new 2015-11-27 00:24:24 -05:00
Unknwon
c50a3503e6 introduce git-shell 2015-11-26 17:33:45 -05:00
Unknwon
2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Unknwon
3ca544912f #1944 Drop /org/ URL path prefix in organization home page 2015-11-24 19:14:00 -05:00
Unknwon
21ad4bf0fe print error log to client side when dev mode 2015-11-23 22:33:24 -05:00
Unknwon
0128036514 #1681 some fixes for builtin SSH server on Windows 2015-11-23 22:32:07 -05:00
Unknwon
52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon
987dcc5372 fix #1383 2015-11-20 02:38:41 -05:00
Unknwon
f455125d4d fix #878 2015-11-18 21:21:47 -05:00
Unknwon
29ed7872f8 repo sidebar active class 2015-11-16 11:16:52 -05:00
Unknwon
5dc3dd1704 fix #1960 2015-11-16 11:11:59 -05:00
Unknwon
134d8e7681 work on #1961 2015-11-16 10:14:12 -05:00
Unknwon
e030109b5a fix api broken 2015-11-15 17:07:44 -05:00
Unknwon
7c80eba77f minor UI fix and fix ssh race 2015-11-14 13:21:31 -05:00
Unknwon
1d57f0d64f Show custom avatars in commits 2015-11-13 17:10:25 -05:00
Unknwon
2db785b3ed convert missing name 2015-11-09 11:39:03 -05:00
Unknwon
647688bd06 #1266 convert name to lower when handle SSH 2015-11-09 11:34:04 -05:00
Unknwon
18c841050b fix 1540 and experimental SSH server support 2015-11-08 16:59:56 -05:00
Unknwon
b55499d039 go vet and fix #1890 2015-11-08 14:31:49 -05:00
Unknwon
676d774d88 fix #1902 2015-11-07 00:39:45 -05:00
Unknwon
f255b1e86d #1896 fatal when no needed update task 2015-11-04 21:57:10 -05:00
Unknwon
a374751eb8 add Makefile 2015-11-03 12:16:43 -05:00
Unknwon
b9f5def5dc fix insecure tls when trigger task 2015-10-26 09:16:24 -04:00
Unknwon
0fbb8c8826 New push to head repo of head branch: regenerate patch and retest apply 2015-10-24 03:36:47 -04:00
Unknwon
b5fdf0947b reduce code 2015-10-22 17:47:08 -04:00
Unknwon
35a65736fa add get repo API 2015-10-22 17:46:07 -04:00
Unknwon
932dbccb67 fix import path, fix #1782 2015-10-15 21:28:12 -04:00
Unknwon
aff49b1c9e unified API error response 2015-10-08 20:36:07 -04:00
无闻
b1941f1da1 Merge pull request #1736 from soudy/develop 
Added repository remove option to API
 2015-10-08 20:01:56 -04:00
Unknwon
db00aa7653 add log for trigger hook when push through SSH 2015-10-05 09:46:00 -04:00
Steven Oud
6fe868a4d5 added repository remove option to api 2015-10-04 23:29:23 +02:00
kendaru
b05c7b3faa moved routes to RouterRef group 2015-10-02 10:48:31 +02:00
kendaru
5c39d3fa7d changed integrated page number to GET 2015-10-02 10:04:11 +02:00
Steven
c8aa9c6cb1 implemented #1721: see users who forked/starred/watched a repository 2015-10-01 15:51:46 +02:00
Unknwon
e787e73e2f fix URL match 2015-09-24 14:20:07 -04:00
Unknwon
3fb1b6a608 drop oauth2 feature support 2015-09-17 16:11:44 -04:00
Unknwon
e75fd2f783 simplify names 2015-09-16 23:08:46 -04:00
Unknwon
e5ed5904c6 #1606 GUI bug while adding ldap user 2015-09-13 10:05:18 -04:00
Unknwon
121a81a2c5 finish new edit auth UI 2015-09-11 12:03:08 -04:00
Unknwon
52ec80fa18 finish all new user settings UI 2015-09-10 11:40:34 -04:00
Unknwon
5020576e80 minor regexp fix on #1593 2015-09-07 11:56:06 -04:00
Unknwon
56eb252098 #1593 fix repo name router bug 2015-09-07 11:51:53 -04:00
Unknwon
c38754d432 #1191 allow upload avatar for org 
Signed-off-by: Unknwon <u@gogs.io>
 2015-09-06 17:12:02 -04:00
Unknwon
6a5c87afdd prepare 0.6.9 release 2015-09-03 17:19:50 -04:00
Unknwon
7ec991326d fix migrate api 2015-09-03 06:48:52 -04:00
Unknwon
e5b105e513 fix migrate API 2015-09-03 06:17:33 -04:00
Unknwon
83dc2468f5 finish initial version of pull request 2015-09-02 16:18:09 -04:00
Unknwon
d951824ff9 able to download archive by API 2015-09-02 09:54:35 -04:00
Unknwon
953bb06857 basic PR feature 2015-09-02 09:26:56 -04:00
Unknwon
37e0cee877 finish PR UI 2015-09-02 04:08:05 -04:00
Unknwon
8c046073a8 work on PR conversation 2015-09-01 19:07:02 -04:00
Unknwon
c08600c59b new edit webhook UI 2015-08-27 01:04:23 +08:00
Unknwon
4217c2333c new create webhook UI 2015-08-27 00:30:06 +08:00
Unknwon
2881456421 new webhooks list UI 2015-08-26 21:45:51 +08:00
Unknwon
1cb03135b7 new repo git hooks UI 2015-08-26 18:03:30 +08:00
Unknwon
a329bbc215 new org dashboard issues 2015-08-25 23:22:05 +08:00
Unknwon
062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +08:00
Unknwon
371572cf5f allow edit issue and comment 2015-08-20 04:31:28 +08:00
Unknwon
87f5ca8e1f able edit issue title 2015-08-19 23:14:57 +08:00
Unknwon
1453e91f41 minor fix on API response 2015-08-19 20:08:57 +08:00
Unknwon
54b52de6ee minor fix on API response 2015-08-19 05:47:45 +08:00
Unknwon
47ac579f09 only assign auto-admin when sign up by web 2015-08-19 04:58:45 +08:00
Unknwon
4c7b6414eb new access token UI 2015-08-19 03:36:16 +08:00
Unknwon
2493454587 new delete account UI and password confirmation 2015-08-19 02:49:44 +08:00
Unknwon
81b8427438 new UI on admin/monitor 2015-08-19 00:34:11 +08:00
Unknwon
6fdc881bd4 detect kill signal 2015-08-18 23:36:08 +08:00
Unknwon
30b428bf0e #1419: 500 when visit a issue with issue/comments of deleted user 2015-08-15 02:48:05 +08:00
Unknwon
cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
Unknwon
133b19d0c5 finish view comments on issue page 2015-08-13 16:07:11 +08:00
Unknwon
b410207dc1 add cache-control for attachments 2015-08-12 04:58:39 +08:00
Unknwon
e67659bf8e fix serve attachment content type 2015-08-12 04:49:51 +08:00
Unknwon
34f6cbfc2a finish attachments when create issue 2015-08-11 23:24:40 +08:00
Unknwon
89c2bd4a0d finish create issue attachment UI 2015-08-11 17:54:00 +08:00
Unknwon
590c464c56 UI: create issue with title and content 2015-08-09 15:23:02 +08:00
Unknwon
dea3a8c6a4 WIP: create PR - choose branch 2015-08-08 22:43:14 +08:00
Unknwon
9db4acc62e improve fork process 2015-08-08 17:10:34 +08:00
Unknwon
3d0583df0f fix private repo cannot trigger hook by SSH 2015-08-08 01:04:12 +08:00
Unknwon
9d414d4dd9 remove Index field of milestone 2015-08-06 23:25:35 +08:00
Unknwon
952c480f4f better version checker 2015-08-06 23:03:04 +08:00
Unknwon
39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon
2c507667bf Merge branch 'develop' of github.com:gogits/gogs into feature/milestone 
# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
 2015-08-05 20:26:00 +08:00
Unknwon
0705f55ce0 finish new milestone page 2015-08-05 20:23:08 +08:00
Unknwon
74bd6b939c milestone: edit 2015-08-05 18:26:18 +08:00
Unknwon
e50982f5ec allow anonymous SSH clone 2015-08-05 11:14:17 +08:00
Unknwon
9311a9858a milestone: pagination 2015-08-04 22:24:04 +08:00
Unknwon
04458d49a0 milestone: list view 2015-08-03 17:42:09 +08:00
Unknwon
cc0d963f75 fix check template version 2015-08-02 11:36:18 +08:00
Unknwon
bdd92dc7d1 fix disable router log option 2015-07-31 15:03:30 +08:00
Unknwon
4cd892c99f fix #1227 2015-07-31 14:25:12 +08:00
Unknwon
ba47306a69 fix #1305 2015-07-28 18:01:39 +08:00
Unknwon
fa298a2c30 #835: Realtime webhooks 2015-07-25 21:32:04 +08:00
Unknwon
54b58e988d Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues 2015-07-25 00:49:40 +08:00
Unknwon
70d44e9565 Merge branch 'master' of github.com:gogits/gogs into develop 2015-07-25 00:48:42 +08:00
无闻
57651060ce Merge pull request #1336 from technosophos/master 
Fix minor spelling issues.
 2015-07-25 00:47:09 +08:00
无闻
6272986192 Merge pull request #1358 from nice-software/wip/certCommonName 
Add CommonName to the self signed certificate
 2015-07-25 00:29:31 +08:00
Unknwon
ac95f6d50f UI: basic label list 
- create new label
 2015-07-24 21:02:49 +08:00
Unknwon
86dbda0b42 UI: basci issue list without filters 
- fix isRead check
- fix paging
 2015-07-24 16:42:47 +08:00
Unknwon
ff051e2106 #1128: API calls are not hidden behind sign in 2015-07-15 19:17:57 +08:00
Paolo Borelli
e94ca36335 Add CommonName to the self signed certificate 
Without a CN the self signed certificate is considered
invalid by chrome.
You can check with: openssl x509 -in cert.pem -subject -noout
 2015-07-11 10:34:25 +02:00
Matt Butcher
d82d9bc153 Fix minor spelling issues. 2015-06-18 05:01:05 -06:00
Luka Dornhecker
1988c0993d remove extra space in ssh authentication message 2015-04-02 22:22:58 +02:00
Unknwon
27c3c5415f #1101 Anyone can see organization pages even without logging in when sign in required 2015-03-23 17:58:52 -04:00
Unknwon
e6cf83b8c0 Put default config into binary 2015-03-18 06:37:44 -04:00
Unknwon
8e815abeb0 #1079: Custom robots.txt should be send with plaintext content-type 2015-03-18 01:29:54 -04:00
Unknwon
33894591a6 #851: Edit Account does not take into consideration password rules 2015-03-17 03:21:58 -04:00
Unknwon
588f3215c6 #1040: dashboard no longer accessible when repo is missing 2015-03-16 04:04:27 -04:00
Unknwon
b447d18dca cmd/serve.go: remove useless code 2015-03-01 18:43:28 -05:00
Unknwon
d446be9f5f models: mirror fix on #964 2015-02-28 22:24:53 -05:00
Peter Smit
556881964f Merge branch 'access' into access_rewriteserv 2015-02-23 12:34:41 +02:00
Unknwon
10e4b5b6c6 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 22:55:35 -05:00
Unknwon
7ccab9cd09 Merge branch 'dev' of github.com:gogits/gogs into access 
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
 2015-02-22 22:51:25 -05:00
Unknwon
059338139c routers: able to migrate repo from local path 
- modules/middleware/context.go: add HandleAPI method
 2015-02-22 09:49:25 -05:00
无闻
fc4dff1b17 Merge pull request #959 from phsmit/access_update 
Updating context and fixing permission issues
 2015-02-21 02:55:30 -05:00
Peter Smit
aa68e86206 Rewrite/simplify gogs serve 2015-02-16 16:38:01 +02:00
Peter Smit
ed89b39984 Updating context and fixing permission issues 
The boolean flags in the repo context have been replaced with mode and two methods

Also, the permissions have been brought more in line with https://help.github.com/articles/permission-levels-for-an-organization-repository/ , Admin Team members are able to change settings of their repositories.
 2015-02-16 12:51:56 +02:00
Peter Smit
f9454cc32c Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Unknwon
685ed1f807 models: fix XORM API break 
cmd/web.go: check version after load config
 2015-02-14 17:01:33 -05:00
Unknwon
6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Peter Smit
6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor 
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
 2015-02-12 14:25:07 +02:00