Commit Graph

3596 Commits

Author SHA1 Message Date
bd5dc626e8 Merge pull request #2139 from angus-g/fixes/pr-messages
Reword messages for PR auto merging (#2117)
2015-12-09 17:31:46 -05:00
626dc1f0bd Reword messages for PR auto merging (#2117) 2015-12-10 09:28:49 +11:00
1b0ef0ec0b Merge pull request #2137 from nanoant/patch/ssh-trigger-via-local-url
LOCAL_ROOT_URL for workers accessing web service
2015-12-09 17:22:37 -05:00
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
b886fb4bf0 LOCAL_ROOT_URL for workers accessing web service
Local (DMZ) URL for gogs workers (such as ssh update) accessing web service. In
most cases you do not need to change default http://localhost:HTTP_PORT/. You
may need to alter it only if your ssh server node is not the same as http node,
eg. running behind proxy on different node than web server.

                     --- 80 public port -> 8080 -- web server node
                    /
    public proxy --<
                    \
                     --- 22 public port -> 10022 -- ssh server node

This option is not intended to be accessible via web GUI settings, since it is
unlikely someone needs to change it to somethings else than default
http://localhost:HTTP_PORT/ which should work for most of the cases.

But this should land into the documentation somewhere.

fixup
2015-12-09 23:11:07 +01:00
fa5e372f75 Merge pull request #2138 from SlavikZ/master
LDAP parameters UI: bind_dn and bind_password are not required
2015-12-09 16:47:03 -05:00
356f1438a6 Merge pull request #2133 from kardianos/develop
gogs: add import that lets gogs run as a stand-alone windows service
2015-12-09 16:12:43 -05:00
a19aaa439d LDAP parameters UI: bind_dn and bind_password are not required 2015-12-09 21:02:19 +02:00
0d469f261e gogs: add import that lets gogs run as a stand-alone windows service
Updates #630
2015-12-09 09:04:10 -08:00
c3440c4dd3 #2035 Show author e-mail in commit diff 2015-12-09 11:46:39 -05:00
718d3ae258 #1943 Able to config fsck timeout 2015-12-09 11:38:12 -05:00
b8d48bdb62 #2037 Add "New Mirror" button on Dashboard 2015-12-09 11:24:56 -05:00
15d62bba82 Merge pull request #2132 from nanoant/patch/do-not-fail-on-missing-lessc
Makefile: Do not fail build on missing lessc
2015-12-09 08:07:18 -05:00
eb6c634475 Makefile: Do not fail build on missing lessc
This is achieved by adding public/css/gogs.css to special .IGNORE target, which
makes inability to generate/update gogs.css non-fatal and not stopping whole
build process. User is still notified about missing lessc command though, since
inability to update CSS may lead to potential problems:

    lessc public/less/gogs.less public/css/gogs.css
    make: lessc: No such file or directory
    make: [public/css/gogs.css] Error 1 (ignored)

More info at:

  https://www.gnu.org/software/make/manual/html_node/Special-Targets.html
2015-12-09 13:32:43 +01:00
eec06fb3df Merge pull request #2126 from angus-g/fixes/commits-branches
Dropdown on commits page to choose branch #1846
2015-12-09 01:42:26 -05:00
df05134494 Break branch-selection dropdown into a template
We only handle branch selection for repo home and commits pages, so the
redirection URL is based on PageIsCommits
2015-12-09 17:15:58 +11:00
9bd3ebe207 Dropdown on commits page to choose branch #1846
I've mostly duplicated the dropdown code from repo/home.tmpl, which
basically only required a change to the URL. This could probably be
broken out into something more modular.
2015-12-09 16:37:04 +11:00
a576224d0e unified name: IsViewBranch, IsViewCommit and IsViewTag 2015-12-09 00:32:53 -05:00
989f30eb41 Merge pull request #2125 from angus-g/fixes/compare-commits
Only show comparison link for >2 commits, fixes #1110
2015-12-08 23:16:03 -05:00
06d293a84e Only show comparison link for >2 commits #1110
We can look at the PushCommits object to see how many commits were
included in a commit, and add some template logic to only show the
comparison link when there are at least 2 commits in a push. We also
correct the link to display the number of commits.
2015-12-09 14:36:39 +11:00
120cd4e471 #1984 Better mirror repo management 2015-12-08 20:06:12 -05:00
1cbd4c01fb #2115 more precise error message 2015-12-08 01:11:40 -05:00
2528c482e9 #1627 auto login after install if admin is configured 2015-12-08 00:59:14 -05:00
b1a53f6d8e add quay.io as another Docker option 2015-12-07 19:40:24 -05:00
fde9c69679 Merge pull request #2122 from nanoant/patch/add-pre-receive-hook
Allow pre-receive hook customization
2015-12-07 19:31:16 -05:00
3df5dcc1dc Allow pre-receive hook customization
This hook can be used for example to reject too large commits and it is
executed before "update" hook, used exclusively by Gogs to update its state.

https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
2015-12-08 01:28:32 +01:00
14080dd61d Merge pull request #2121 from nanoant/patch/less-n-template-indent
Consistent tab indentation for all source files
2015-12-07 19:04:13 -05:00
da2585c11e Indent all templates with tabs
This commit improves templates readability, since all of them use consistent
indent with all template command blocks indented too.

1. Indents both HTML containers such as <div>, <p> and Go HTML template blocks
   such as {{if}} {{with}}

2. Cleans all trailing white-space

3. Adds trailing last line-break to each file
2015-12-08 00:57:46 +01:00
dd8a06a397 LESS: Use tabs for indent in all files
This does not change any content and generated gogs.css is still the same.
2015-12-07 21:20:54 +01:00
4e0c697aaf force new INI version 2015-12-07 11:33:04 -05:00
3ffbb54337 minor fix for #2113 and other locales 2015-12-07 00:10:08 -05:00
67cfb6735b Merge pull request #2113 from OhDaeto/patch-1
Update Russian translation
2015-12-07 00:05:36 -05:00
b7508b06fa Update locale_ru-RU.ini 2015-12-07 08:02:16 +03:00
2a0db47935 Update Russian translation 2015-12-07 07:27:17 +03:00
dce2a9e7e1 fix wrong slack webhook payload URL 2015-12-06 23:07:02 -05:00
abb02889f2 Merge pull request #2112 from nanoant/patch/better-git-message-display
Render commit msg as header + verbatim description
2015-12-06 20:06:23 -05:00
e2ca53029e Render commit msg as header + verbatim description
Most commit in Git are expected to follow standard of single header line,
followed by description paragraphs, separated by empty line from previous block.

Previously Gogs were treating everything as single header. Now we are trying to
render only first line as header, but following lines (description chunks) as a
verbatim.
2015-12-07 01:50:45 +01:00
b5f6206a65 prepare release 2015-12-06 15:34:17 -05:00
3de9c11ea7 Merge pull request #2110 from msoedov/misspellings
Fix misspelled words
2015-12-06 15:27:11 -05:00
ae54d878c0 Fix misspelled words 2015-12-06 16:42:23 +02:00
89244b74c6 remember page number when delete repo 2015-12-05 17:49:46 -05:00
ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -05:00
978dc00305 APIs: admin users 2015-12-05 17:13:13 -05:00
bf26808fb3 update README 2015-12-05 13:50:43 -05:00
404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
f0ee33267c fix #2102 2015-12-05 11:46:42 -05:00
f3eaa4c592 Set default language for i18n 2015-12-05 01:20:11 -05:00
f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
e82ee40e9e init with all enabled 2015-12-04 21:34:37 -05:00
1ee7c33e93 template fix 2015-12-04 21:32:33 -05:00