mirror of
1
Fork 0
Commit Graph

3912 Commits

Author SHA1 Message Date
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
Unknwon 23bc9a2911 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 47adc0e8f7 Bump git-module. Fixes #2589 2016-02-11 17:03:39 -05:00
Unknwon 5258ee3740 Update locales and update sponsor 2016-02-11 13:34:21 -05:00
Unknwon 59745c62b4 #1577 fix missing SQL query placeholder 2016-02-10 17:30:24 -05:00
Unknwon 0ad5f51059 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
Martin Hartkorn 6b3e47b103 Removed HTTP 500 error on the release page when a user deleted their account 2016-02-10 22:04:11 +01:00
Unknwon 297e772c20 #2485 fix payloads mixed up for webhook
When repository contains a Slack type hook,
it changes original payload content.

This patch fixes it by using a local object to store
newly created Slack payload instead of assigning
back to the same variable.
2016-02-10 15:21:39 -05:00
Unknwon 8bf3032b16 Merge pull request #2585 from andreynering/theme-color-meta-tag
Implementing the "theme-color" meta tag.
2016-02-08 15:03:08 -05:00
Andrey Nering e40d94bb4f Implementing the "theme-color" meta tag.
Used by Android >= 5.0 to make the top bar colored.

Reference: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
2016-02-08 17:03:18 -02:00
Unknwon 7ffe845c61 Merge pull request #2582 from chriswatt/tabindex
Fix tab index on new issue/comment form
2016-02-07 17:18:30 -05:00
chriswatt af8e323248 Fix tab index on new issue/comment form 2016-02-07 22:14:33 +00:00
Unknwon b09ddc72d2 Merge pull request #2581 from chriswatt/committab
Make commits tab active when on diff page
2016-02-07 15:37:22 -05:00
chriswatt a881f776d0 Make commits tab active when on diff page 2016-02-07 20:11:25 +00:00
ExMex 40f9d4f920 Reverted showing (private) on private org relations 2016-02-07 20:30:15 +01:00
Unknwon dd7608a36e Merge pull request #2580 from fnkr/smaller-issue-title
Make issue title smaller
2016-02-07 14:30:04 -05:00
Florian Kaiser 662482d366 Make issue title smaller 2016-02-07 19:23:26 +00:00
Unknwon 08ff1b7d4b Merge pull request #2579 from nanoant/patch/fix-ldap-username
Fix #2221 LDAP username attribute must be fetched
2016-02-07 12:27:10 -05:00
Adam Strzelecki 3808638df1 Fix #2221 LDAP username attribute must be fetched
This is fix-up for 573305f. Forgot to fetch AttributeUsername value from the
LDAP server, so the setting was effectively not working as intended.
2016-02-07 18:18:29 +01:00
Unknwon ee53204e02 Improve db path prompt when install 2016-02-07 11:51:53 -05:00
Unknwon f15a2f9b25 Merge pull request #2528 from andreynering/diff-sintax-highlight-733
Enable syntax highlighting on diff view
2016-02-07 11:49:11 -05:00
Unknwon 3b102a71a2 Merge pull request #2576 from chriswatt/commentarrows
Add avatar arrows to both pull request and issue forms
2016-02-07 11:45:37 -05:00
chriswatt 133397ee0d Rename #avatararrow to #avatar-arrow 2016-02-07 16:41:11 +00:00
Unknwon e2b4a24cb6 Merge pull request #2570 from andreynering/fix-1738
Workaround delete folder on Windows.
2016-02-07 10:46:23 -05:00
Andrey Nering d37cf09ccd Workaroud delete folder on Windows. Fix #1738 2016-02-07 13:39:32 -02:00
ExMex 2cfe6f8c60 Admins and user itself sees private org relations on profile 2016-02-07 10:20:58 +01:00
chriswatt 16270ee9a4 Add avatar arrow to pull request form 2016-02-07 06:10:57 +00:00
chriswatt 1dfead1eef Add avatar arrows to new both new issue comment forms 2016-02-07 04:20:11 +00:00
Unknwon 894946c319 Merge pull request #2573 from prologic/add-note-wrt-ssh-on-docker#2409
Add an important note about mapping the ssh port on the container to the host
2016-02-06 20:22:43 -05:00
Florian Kaiser 45db167f7a Only show activities for repositories on dashboard, that the user has access to 2016-02-06 07:52:21 +00:00
Unknwon 10fbb1aa2f Merge pull request #2565 from tkausl/issue2563
fixes #2563
2016-02-05 19:15:54 -05:00
Tobias Kunicke bc0eee48d5 parse milestone.deadline as local time 2016-02-06 00:10:32 +01:00
Tobias Kunicke fa5a1cb54f regulate timezone for milestone.deadline 2016-02-06 00:08:02 +01:00
Unknwon e797a225b6 Fix #2564 file ignored by git 2016-02-05 17:19:32 -05:00
Unknwon 6d5c986d4f Merge pull request #2562 from Eriner/master
optipng
2016-02-05 16:18:52 -05:00
Matt Hamilton 45659d0fd2 optipng 2016-02-05 16:04:11 -05:00
Unknwon acfc942ad7 Generate CSS for #2561 2016-02-05 14:53:45 -05:00
Unknwon db150f2e42 Merge pull request #2561 from chriswatt/develop
Add small arrows on issue comments pointing to users avatar
2016-02-05 14:50:49 -05:00
chriswatt 9fe9cd8b5c Add small user arrows on issue comments pointing to users avatar 2016-02-05 19:24:23 +00:00
Unknwon f8182ac521 #2558 delete local wiki copy when rename repo and user 2016-02-05 14:11:53 -05:00
Unknwon 4e96a4a62b Merge pull request #2406 from bkcsoft/feature/markdown-custom-url-scheme
Feature/markdown custom url scheme
2016-02-05 13:11:45 -05:00