a7dc8d8c6f
Merge pull request #929 from repotag/830_pagename_encodings
...
Allow utf-8 page names when not using grit. Resolves #830 (when using rugged adapter).
2015-01-04 13:07:27 +01:00
355db16d2c
Allow utf-8 page names when not using grit.
2015-01-04 12:20:25 +01:00
c54ce41eb7
Merge pull request #928 from LEW21/compare-escape-redirect
...
Encode the page title in the URL of a diff page
2015-01-03 19:58:56 +01:00
afb7d4c9d1
Encode the page title in the URL of a diff page.
2015-01-03 17:56:51 +01:00
b55cdde9da
Merge pull request #924 from rtrvrtg/patch-1
...
Fix wiki_options errors for hosted Gollum instances.
2014-12-29 12:31:39 +01:00
93cbc6c770
Fix intermittent wiki_options errors
...
Changed to resolve intermittent errors where I'd see the following in my logs:
```text
ERROR -- : app error: undefined method `wiki_options' for Precious::App:Class (NoMethodError)
ERROR -- : /home/gollum/production/releases/20141229-172128/vendor/bundle/ruby/2.0.0/gems/gollum-3.1.1.1anchor4/lib/gollum/editing_auth.rb:10:in `call'
ERROR -- : /home/gollum/production/releases/20141229-172128/vendor/bundle/ruby/2.0.0/gems/rack-protection-1.5.3/lib/rack/protection/xss_header.rb:18:in `call'
...
```
I suspect this is the case for Sinatra applications that host instances of Gollum using its `map` feature, as this reflects the production setup we're using it in. Calling @app.settings.wiki_options uses the app instance that gets passed into Precious::EditingAuth, thereby ensuring that we're getting a Gollum instance all the time.
2014-12-29 17:28:47 +11:00
3b1b4a0a96
Update README.md
2014-12-22 20:28:50 +01:00
10b45cb54d
Add --bare command line option (see #811 ).
2014-12-22 20:20:57 +01:00
9d289e571b
Describe important security update.
2014-12-18 16:44:23 +01:00
cce871c30e
Allow running tests with alternative adapter
2014-12-08 01:44:01 +01:00
c2b605a90f
Release 3.1.1
2014-12-04 14:06:57 +01:00
09149592b5
Set allow_editing in Precious::App to true by default. Closes #911
2014-12-04 13:53:58 +01:00
e7410e551b
Bring rake dependency up to date.
2014-11-28 14:13:40 +01:00
9d77bc4192
Release 3.1.0
2014-11-28 14:06:36 +01:00
537fa0c423
Merge branch 'rc'
2014-11-28 13:38:33 +01:00
c78dbc8bc1
Merge branch 'master' into rc
...
Conflicts:
README.md
lib/gollum/app.rb
2014-11-28 13:36:21 +01:00
249eed5c2c
Update HISTORY.md
2014-11-28 13:26:47 +01:00
55eb3b24f7
Merge pull request #904 from ut7/latest_changes_test_fix_dependency
...
Update test to avoide being dependent on git configuration
2014-11-28 12:39:12 +01:00
508c255d0f
Update test to avoide being dependent on git configuration
...
The previous test implementation was dependent on the git configuration:
renames = copies
It could then pass on a computer with that config but not passe on
a different developpeur computer who could have a different git configuration.
That new implementation is testing the same behaviour but at a lower
level and is not dependent on the git configuration anymore.
2014-11-28 12:12:23 +01:00
9f8a90c0ac
Merge pull request #875 from ut7/latest-changes
...
Add a "latest changes" button and page
2014-11-27 19:22:42 +01:00
861dc935cb
Configure git on Travis
2014-11-27 19:12:54 +01:00
96ef8cacea
Merge pull request #899 from repotag/gollum-lib-112
...
Fix tests, see https://github.com/gollum/gollum-lib/issues/112
2014-11-27 14:11:01 +01:00
5f3ecc8713
Merge pull request #901 from repotag/prepare-release
...
Prepare new release.
2014-11-27 13:58:24 +01:00
8b8ef0eb46
Prepare new release.
2014-11-27 13:51:02 +01:00
2dbea54c84
Merge pull request #900 from repotag/adapter-flag
...
Implement git adapter CLI flag.
2014-11-26 00:47:39 +01:00
a776d9fb6f
Implement git adapter CLI flag.
2014-11-26 00:33:03 +01:00
57b7bbff5a
Update README.md
...
Updated command line options.
2014-11-25 23:43:42 +01:00
a832b0ed54
Fix tests, see https://github.com/gollum/gollum-lib/issues/112
2014-11-25 19:54:31 +01:00
3ec75b84ae
Merge pull request #898 from bambycha/editable
...
Disable editing from UI
2014-11-22 12:15:24 +01:00
b932763080
add function to disable editing, resolves #879
2014-11-17 19:46:46 +02:00
374f8f2f69
First attempt at a global latest changes overview.
...
- uses a wiki_options entry named :latest_changes_count instead of a
constant
- lists modified pages with links
2014-11-11 22:43:34 +01:00
226c253d5a
Merge pull request #895 from repotag/rc_fix_sidebar
...
Fix sidebar, header, and footer, and add regression test.
2014-11-10 22:54:05 +01:00
c78a9f7950
Fix sidebar, header, and footer, and add regression test.
2014-11-10 22:39:42 +01:00
7264510ab2
Merge pull request #893 from tuftedocelot/add-systemd
...
Add systemd service file to contrib and move openrc files to contrib directory as well.
2014-11-06 22:03:18 +01:00
3458ec6511
Merge pull request #894 from repotag/892-view-file-revisions
...
Route /filename/[commit-sha] will display specific revision of a file. Resolves #892 .
2014-11-06 21:57:25 +01:00
2c80db6678
Route /filename/[commit-sha] will display specific revision of a file. Resolves #892 .
2014-11-06 21:31:23 +01:00
439aa6e4f5
Prepare contrib directory
...
Move openrc files to contrib/ in conjunction with systemd service.
Update gemspec to bundle contrib/ into the gem.
2014-11-06 14:20:33 -06:00
adf544dca9
Add systemd service file to contrib
...
Supersedes #887 to add a systemd unit file which will run as a user and
whose gollum path and options can be changed as needed.
2014-11-06 10:33:18 -06:00
0965269ee9
Merge pull request #890 from repotag/ignore_footer_header_sidebar_if_empty
...
Do not render footers, headers and sidebars if (after formatting) they are empty. Resolves #398 .
2014-11-05 09:10:28 +01:00
19d370c4e9
Merge pull request #891 from repotag/704-showall-files
...
Resolves #704 . Implements the fix proposed by @bdillahu in https://github.com/gollum/gollum/pull/767 and modifies tests accordingly.
2014-11-05 02:48:03 +01:00
cee0f8b652
Change pages display to handle non-wiki file types with --show_all enabled
2014-11-05 02:30:07 +01:00
37664d3487
Do not render footers, headers and sidebars if (after formatting) they are empty. Resolves #398 .
2014-11-05 02:15:35 +01:00
5a78015d81
Merge pull request #889 from repotag/888-h1-logic
...
Page header now uses h1-title logic. Resolves #888 .
2014-11-04 23:34:42 +01:00
7250962ba3
Page header now uses h1-title logic.
2014-11-04 23:23:46 +01:00
442120bfdb
Merge pull request #884 from tuftedocelot/issue600-docs
...
add detail to inline help
2014-10-28 20:25:52 +01:00
de624d1e54
add detail to inline help
2014-10-27 07:12:43 -05:00
523029cc45
Merge pull request #876 from LEW21/delete-commit-rc
...
Fix the commit information for page deletion. Solves #807 .
2014-10-11 14:21:50 +02:00
934affe419
Fix the commit information for page deletion.
...
Now they will be authored by the gollum.author.
2014-10-11 13:15:23 +02:00
55b9af1589
Merge pull request #869 from lucas-clemente/rc
...
allow uploading files by drag and drop (if uploading files is enabled).
2014-10-05 08:22:40 -04:00
16dd7e46ef
allow uploading files by drag and drop
2014-10-05 14:15:48 +02:00
Dawa Ometto
Janusz Lewandowski
Geoffrey Roberts
Étienne Charignon
Roman Bambycha
Bart Kamphorst
tuftedocelot
Lucas Clemente