2
0
Commit Graph

3644 Commits

Author SHA1 Message Date
Unknwon
970e514f4e #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
7e43b5660e Add issue and pull request template 2016-02-17 21:22:58 -05:00
Unknwon
fe2ee5b1bf Merge pull request #2649 from andreynering/gh-issue-template
Add GitHub's issue and pull request templates.
2016-02-17 18:29:35 -05:00
Andrey Nering
e7b1cad47e Add GitHub's issue and pull request templates. 2016-02-17 21:15:11 -02:00
Unknwon
d905826bb1 #2646 fix panic on pushing repositor 2016-02-17 15:17:52 -05:00
Unknwon
c99b55c020 #2639 add branch prefix for test webhook 2016-02-17 15:05:07 -05:00
Unknwon
8d510aa6ff #2633 fix removed config option 2016-02-16 13:27:02 -05:00
Unknwon
5590a32a03 Merge pull request #2635 from lunny/develop
fix dependency broken because xorm's API changed
2016-02-16 13:23:44 -05:00
Lunny Xiao
b7b5961279 fix dependency broken because xorm's API changed 2016-02-16 22:35:08 +08:00
Unknwon
a65c53aeba Add env var check for update 2016-02-15 23:11:22 -05:00
Unknwon
bfc85fc0a9 #2630 fix wrong user avatar link in webhook
Was using the wrong method and now uses the method which checks if
the avatar link is relative or not.
2016-02-15 15:18:53 -05:00
Unknwon
871ceac7de Minor fix for #2624 2016-02-15 14:57:15 -05:00
Unknwon
4d6f101c32 Merge pull request #2624 from mhartkorn/convert-mirror-to-repo
Convert mirrors to regular repositories
2016-02-15 14:26:21 -05:00
Martin Hartkorn
3887dda67e Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database 2016-02-15 14:59:24 +01:00
Unknwon
587a394094 Setup CI with testing 2016-02-14 23:20:07 -05:00
Unknwon
354dd25700 Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon
3947b4aedc Minor fix for #2578 2016-02-14 20:36:03 -05:00
Unknwon
b1e75c8f86 Merge pull request #2578 from exmex/develop
Admins and user itself sees private org relations on profile
2016-02-14 20:34:53 -05:00
Unknwon
bbcd0a2f2b fix #2454 2016-02-14 20:26:49 -05:00
Unknwon
689339d461 Hijack #2388 2016-02-14 20:19:00 -05:00
Unknwon
8f32600b46 Minor fix for #2567 2016-02-14 20:07:42 -05:00
Unknwon
e5c5576f76 Merge pull request #2567 from fnkr/hide-other-teams-activity-from-dashboard
Only show activities and repositories on the dashboard, that the user has access to
2016-02-14 19:57:49 -05:00
Unknwon
55ddb90e64 #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
Unknwon
35ace394af Merge pull request #2617 from chriswatt/bgcolor
Change main content area bg to white, keep area above tabs grey
2016-02-14 18:33:17 -05:00
chriswatt
1a40f8e470 Fix when repo is empty 2016-02-14 23:26:47 +00:00
chriswatt
181d93d7bc Add grey bg to tabs on repo page 2016-02-14 23:09:33 +00:00
Martin Hartkorn
71c5f9133e Refactored according to suggestions 2016-02-14 22:40:39 +01:00
Martin Hartkorn
b61a90be42 Add missing safety check 2016-02-14 21:22:36 +01:00
Martin Hartkorn
e31b92a896 Convert mirrors to regular repositories. 2016-02-14 21:12:00 +01:00
Unknwon
3756180638 Remove unused tests
Module httplib will be replaced a well done third-party package
soon, so remove its unused tests
2016-02-13 18:11:15 -05:00
Unknwon
8cf9f6040f Merge pull request #2614 from joshfng/add-default-branch-to-repo-payload
Add default branch to repo payload
2016-02-12 16:51:46 -05:00
Unknwon
9008705d42 Merge pull request #2612 from Eriner/master
update .gopmfile to reflect git-module update
2016-02-12 14:50:03 -05:00
Matt Hamilton
a1ab18ce6b update .gopmfile to reflect git-module update
Updated to reflect version increment in commit 9925d25.
2016-02-12 12:40:35 -05:00
Josh Frye
4b87e480bf Add default branch to repo payload 2016-02-12 11:04:46 -05:00
Unknwon
7b6e496fab Merge pull request #2609 from joshfng/add-config-log-path
Add install option for log path
2016-02-12 10:21:46 -05:00
Josh Frye
7a6c325e78 Remove redundant nil check. 2016-02-12 10:15:47 -05:00
Josh Frye
a87aabe835 Make log path required 2016-02-12 10:10:02 -05:00
Josh Frye
05fc8acf19 Set default log path if empty during install 2016-02-12 10:03:04 -05:00
Josh Frye
ab7816a69f Add helper text for log path. 2016-02-12 09:24:09 -05:00
Josh Frye
1b9438c2eb Add install option for log path 2016-02-12 09:19:45 -05:00
Unknwon
3d9fb6ab06 Minor docs update for #2605 2016-02-12 08:18:12 -05:00
Unknwon
df4a5c5159 Merge pull request #2605 from 0rax/develop
Add the ability to run crond inside the Docker container
2016-02-12 08:14:26 -05:00
Jean-Philippe Roemer
d18dc69ade Add the ability to run crond inside the Docker container
- Add the crond init script for s6
- Add the RUN_CROND configuration variable to setup crond
- Crond will not be run by default (hence the `down` file in the service directory)
- `start.sh` check if RUN_CROND = "true" || "1" and remove this file to tell s6 to run the initscript
- Resolves #2597
2016-02-12 02:48:55 +00:00
Unknwon
69e7c318f1 Merge pull request #2604 from joshfng/fix-wiki-transfer
Remove local wiki copy on repo transfer. Fixes #2558
2016-02-11 19:57:19 -05:00
Josh Frye
4b703b92f7 Remove local wiki copy on repo transfer. Fixes #2558 2016-02-11 19:26:51 -05:00
Unknwon
ca0693c873 Merge pull request #2603 from joshfng/bump-git-module-version
Bump git-module. Fixes #2589
2016-02-11 17:09:06 -05:00
Josh Frye
9925d25cf8 Bump git-module. Fixes #2589 2016-02-11 17:03:39 -05:00
Unknwon
39fc9747cb Update locales and update sponsor 2016-02-11 13:34:21 -05:00
Unknwon
025ba7ff65 #1577 fix missing SQL query placeholder 2016-02-10 17:30:24 -05:00
Unknwon
481f29bed4 Merge pull request #2599 from mhartkorn/fix-release-error-deleted-user
Fix for server error on release page when a user deleted their account
2016-02-10 16:11:56 -05:00