deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4453 commits 6 branches 43 tags 25 MiB
Commit graph

2519 commits

Author SHA1 Message Date
Dan Knox
7665b1de7e Use Gitlab Markdown for Markdown files and Gollum to render the rest. 
This commit enables the usage of the Gitlab Markdown post processing
on all Markdown formatted files. For file types that do not contain
Markdown, it defaults to the Gollum native renderer to process the
content.
 2013-03-13 23:31:08 -07:00
Dan Knox
1479f17227 Add Spinach coverage for Gollum Wiki system and correct the Delete link. 
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.

The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.

The link has been corrected and all steps are now passing.
 2013-03-10 14:59:20 -07:00
Dan Knox
ea9b3687db Replace current Wiki system with Gollum Wikis. 
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.

The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:

* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.

The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
 2013-03-09 16:39:51 -08:00
Dmitriy Zaporozhets
8e8372d5ce better logo images for header 2013-03-10 00:12:25 +02:00
Dmitriy Zaporozhets
9c709be335 fix event relative date being cached 2013-03-08 13:14:47 +02:00
Sebastian Ziebell
3374027e3a Merge branch 'master' into fixes/api, code clean up and tests fixed 
Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb
 2013-03-07 14:51:56 +01:00
Dmitriy Zaporozhets
a32f85ac76 Merge pull request #3139 from rapofran/auto_focus_ldap_login 
Autofocus to username input (LDAP login).
 2013-03-07 01:55:19 -08:00
Dmitriy Zaporozhets
ca9098d898 remove last commit widget, added repo size and owner info on project home page 2013-03-07 11:14:19 +02:00
Dmitriy Zaporozhets
e90277f9b5 show project description on public area 2013-03-07 10:08:43 +02:00
Dmitriy Zaporozhets
9dc46eee8e Return project description back 2013-03-06 22:56:48 +02:00
Dmitriy Zaporozhets
7b38a0de98 show highlighted code correctly inside issue body 2013-03-06 21:48:15 +02:00
Dmitriy Zaporozhets
872cf404eb fix js syntax error 2013-03-06 21:39:10 +02:00
Dmitriy Zaporozhets
19e9c736e7 add system hooks api docs to help content 2013-03-06 21:12:47 +02:00
Dmitriy Zaporozhets
4c1538a946 Use redis as cache storage. cache events 2013-03-06 17:30:48 +02:00
Dmitriy Zaporozhets
40f1868194 Fix loading animation while browsing tree 2013-03-06 17:12:28 +02:00
Dmitriy Zaporozhets
d03af842c5 fix public projects identations 2013-03-06 09:12:14 +02:00
Sebastian Ziebell
61cfa2a7a6 Merge branch 'master' into fixes/api 
Conflicts:
	lib/api/projects.rb
 2013-03-05 22:29:49 +01:00
Dmitriy Zaporozhets
6beae84ea3 reduce letter-spacing for top nav 2013-03-05 17:28:13 +02:00
Dmitriy Zaporozhets
a99ad3d355 tree_heleper: concat html only if present. Avoid nil exception 2013-03-05 17:15:20 +02:00
Dmitriy Zaporozhets
9ba21dd0c4 better solution for #3027 2013-03-05 17:07:12 +02:00
Dmitriy Zaporozhets
da6b53a80e Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1 
Conflicts:
	app/observers/user_observer.rb
	spec/observers/user_observer_spec.rb
 2013-03-05 16:48:18 +02:00
Dmitriy Zaporozhets
d5d9f1c515 Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc 
fix: grouping commits by date desc doesn't sort the groups too
 2013-03-05 06:40:13 -08:00
Dmitriy Zaporozhets
c2ba868c9b Merge pull request #2954 from cabeca/fix-image-url-emoji 
Fix image url for emoji.
 2013-03-05 05:52:01 -08:00
Dmitriy Zaporozhets
f22488f726 Merge pull request #3143 from Undev/state-machine-3 
State machine 3
 2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets
f9200e118c remove custom font 2013-03-05 13:16:56 +02:00
Dmitriy Zaporozhets
9bb35e7e59 Prevent app crash if team owner removed 2013-03-05 09:27:06 +02:00
Dmitriy Zaporozhets
3a09f02e11 Merge pull request #3109 from hiroponz/improve-network-graph 
Improve network graph
 2013-03-04 23:02:27 -08:00
J. Francisco Raposerias
a40541c42d add autofocus to username input 2013-03-04 17:54:26 -03:00
Dmitriy Zaporozhets
bf06b3196d Make clone widget read-only 2013-03-04 22:18:53 +02:00
Dmitriy Zaporozhets
730e79e787 better event-notes typography 2013-03-04 22:00:51 +02:00
Dmitriy Zaporozhets
d54845a16a use md-typography for note content 2013-03-04 21:34:26 +02:00
Dmitriy Zaporozhets
dc7507cfe7 = preserve do was ignored for empty project page so was replaced with filter 2013-03-04 21:12:36 +02:00
Dmitriy Zaporozhets
533693ab41 Fix dark color bg for wiki 2013-03-04 21:11:03 +02:00
Dmitriy Zaporozhets
24cc0faf2c add link ti public area 2013-03-04 20:11:23 +02:00
Dmitriy Zaporozhets
c2082f4d78 Fix edit team page 2013-03-04 19:47:20 +02:00
Andrew8xx8
0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Dmitriy Zaporozhets
5b4032d175 Merge pull request #3118 from 2called-chaos/dont_send_mails_twice 
Do not send issue status mail twice if author = assignee
 2013-03-02 10:48:22 -08:00
Dmitriy Zaporozhets
907c334fe0 fix decorate call for milestone users 2013-03-02 13:23:30 +02:00
Dmitriy Zaporozhets
ef646928e4 better presenting for group description 2013-03-01 16:26:26 +02:00
Sven Pachnit
c280c3ce6d Do not send issue status mail twice if author = assignee 2013-03-01 15:09:14 +01:00
Dmitriy Zaporozhets
5c3cb47c16 Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions 
Conflicts:
	db/schema.rb
 2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets
dbcf4144ee use simple decorate on single commits 2013-03-01 15:35:22 +02:00
Dmitriy Zaporozhets
6aead7991f fix decorate calls on collections after draper update 2013-03-01 15:24:59 +02:00
Dmitriy Zaporozhets
22d6ce9873 Merge pull request #3082 from devote/patch-1 
Distorted lines in `diff`
 2013-02-28 23:46:07 -08:00
Dmitriy Zaporozhets
1c517153a8 fix admin users tests 2013-02-28 19:56:36 +02:00
Dmitriy Zaporozhets
115454f3ed created-by-me filter for issues inside project. Fixed global project.issues order 2013-02-28 17:46:28 +02:00
Dmitriy Zaporozhets
e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker 
Conflicts:
	Gemfile.lock
 2013-02-28 17:02:20 +02:00
Andrew8xx8
2f1f05d431 Fixed notes from randx 2013-02-28 18:55:35 +04:00
Thomas Berger
7ed0878654 added text-templates for mail notification 2013-02-28 16:39:58 +02:00
Andrew8xx8
d3f042a6f2 Css classes improved 2013-02-28 18:35:27 +04:00