Commit Graph

3952 Commits

Author SHA1 Message Date
Unknwon 60896c66af Merge pull request #2658 from fnkr/fix-chmod
Fix chmod for several files in conf/locale/ and public/
2016-02-18 14:39:27 -05:00
Florian Kaiser eb009923f4 Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00: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 2fdf8fc938 Add issue and pull request template 2016-02-17 21:22:58 -05:00
Unknwon 89d6b18dad 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 b97780ba51 Add GitHub's issue and pull request templates. 2016-02-17 21:15:11 -02:00
Unknwon ccc94dd11c #2646 fix panic on pushing repositor 2016-02-17 15:17:52 -05:00
Unknwon d5ca913b2f #2639 add branch prefix for test webhook 2016-02-17 15:05:07 -05:00
Gibheer dab74f21b7 remove ed25519 test for now
TravisCI is too old for ed25519, so it can't be tested correctly.
2016-02-17 11:30:48 +01:00
Gibheer 9eef2e706c fix ssh public key tests
The old API was using []byte, but was changed to string without running
the tests again.
It also sets the variables from the configuration to make them work.
Maybe there is a better way to do this.
2016-02-17 09:33:41 +01:00
Gibheer 12403bdfb0 allow native and ssh-keygen public key check
This commit adds the possibibility to use either the native golang
libraries or ssh-keygen to check public keys. The check is adjusted
depending on the settings, so that only supported keys are let through.

This commit also brings back the blacklist feature, which was removed in
7ef9a05588. This allows to blacklist
algorythms or keys based on the key length. This works with the native
and the ssh-keygen way.

Because of #2179 it also includes a way to adjust the path to
ssh-keygen and the working directory for ssh-keygen. With this,
sysadmins should be able to adjust the settings in a way, that SELinux
is okay with it. In the worst case, they can switch to the native
implementation and only loose support for ed25519 keys at the moment.
There are some other places which need adjustment to utilize the
parameters and the native implementation, but this sets the ground work.
2016-02-16 23:01:56 +01:00
Unknwon 3af1d3c581 #2633 fix removed config option 2016-02-16 13:27:02 -05:00
Unknwon 24829f314b 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 779b71eda4 fix dependency broken because xorm's API changed 2016-02-16 22:35:08 +08:00
Unknwon 9cf4fe043b Add env var check for update 2016-02-15 23:11:22 -05:00
Unknwon 2765b5c7cf #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 632c27802c Minor fix for #2624 2016-02-15 14:57:15 -05:00
Unknwon dc89c51f3e 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 bb595666ac Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database 2016-02-15 14:59:24 +01:00
Unknwon e9b9e6eb53 Setup CI with testing 2016-02-14 23:20:07 -05:00
Unknwon 58e004f7da Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon fd92d91da3 Minor fix for #2578 2016-02-14 20:36:03 -05:00
Unknwon d8631b616e 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 aa5e837c65 fix #2454 2016-02-14 20:26:49 -05:00
Unknwon 4f6c3e8bb2 Hijack #2388 2016-02-14 20:19:00 -05:00
Unknwon a1d97e8f5c Minor fix for #2567 2016-02-14 20:07:42 -05:00
Unknwon daa43cfb6e 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 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
Unknwon 29cd8ac270 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 d710b5e791 Fix when repo is empty 2016-02-14 23:26:47 +00:00
chriswatt c47866b34a Add grey bg to tabs on repo page 2016-02-14 23:09:33 +00:00
Martin Hartkorn 15d37b7a95 Refactored according to suggestions 2016-02-14 22:40:39 +01:00
Martin Hartkorn 15394f613f Add missing safety check 2016-02-14 21:22:36 +01:00
Martin Hartkorn 3650bd8528 Convert mirrors to regular repositories. 2016-02-14 21:12:00 +01:00
Unknwon de3be370f7 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 364874937e 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 10e4887b2b Merge pull request #2612 from Eriner/master
update .gopmfile to reflect git-module update
2016-02-12 14:50:03 -05:00
Matt Hamilton 643acdd32d update .gopmfile to reflect git-module update
Updated to reflect version increment in commit 47adc0e.
2016-02-12 12:40:35 -05:00
Josh Frye 8662990746 Add default branch to repo payload 2016-02-12 11:04:46 -05:00
Unknwon 25845ea1a5 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 d3ca5accfd Remove redundant nil check. 2016-02-12 10:15:47 -05:00
Josh Frye 8ab5399e83 Make log path required 2016-02-12 10:10:02 -05:00
Josh Frye ec478b4b06 Set default log path if empty during install 2016-02-12 10:03:04 -05:00
Josh Frye 1feecd6beb Add helper text for log path. 2016-02-12 09:24:09 -05:00
Josh Frye a3e8c32a30 Add install option for log path 2016-02-12 09:19:45 -05:00
Unknwon 779bb890fa Minor docs update for #2605 2016-02-12 08:18:12 -05:00
Unknwon 1fa4fe706a 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 f4bc9263d9 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 600d8edaca 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 ce3708b3ea Remove local wiki copy on repo transfer. Fixes #2558 2016-02-11 19:26:51 -05:00