Commit graph

170 commits

Author SHA1 Message Date
randx caeb65b189 Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order 2012-09-15 01:02:58 +03:00
Riyad Preukschas e802d00996 Completely redo loading of notes with JS 2012-09-14 21:41:56 +02:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
randx acc5302c3f improve profile layout after omniauth changes 2012-09-12 18:56:44 +03:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
2012-09-12 06:49:52 +03:00
Saito 96d4f22e53 tree view need use ascii-8bit, file name need be utf8. 2012-09-11 19:18:14 +08:00
Vanja Radovanović 7e2846fb57 using blank?, much shorter 2012-09-10 17:32:31 +02:00
Vanja Radovanović 8d171a8cbc fixed commit title when commit message is an empty string and ensured that link_to_gfm helper doesn't break on nil body 2012-09-10 14:40:35 +02:00
Dmitriy Zaporozhets 52d29f5d59 Project team page improved 2012-09-10 09:14:37 +03:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup
Use GitHub::Markup to parse markup files
2012-09-09 03:34:50 -07:00
Riyad Preukschas 9a4c22d395 Remove unnecessary check in Markdown helper 2012-09-08 01:11:32 +02:00
randx 048117c05d projects helper added 2012-09-07 19:57:13 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files
Closes #1382
2012-09-05 16:52:49 -04:00
Robert Speicher 90f587f4ee Move the entire gfm method to Gitlab::Markdown, which will be a module now 2012-09-05 16:06:20 -04:00
randx aecbd313bc Fix glm by adding id and classes to sanitize white attrs 2012-09-02 15:25:54 +03:00
randx beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
Dmitriy Zaporozhets 793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
Riyad Preukschas 806695f491 Split and reformat markdown options and add refs to their docs.
Also add hard_wrap option.
2012-08-27 21:20:13 +02:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
Riyad Preukschas 32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter
Allow filtering issues that have no milestone or assignee
2012-08-16 22:33:56 -07:00
Robert Speicher feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Robert Speicher 65bcc41f3e Allow disabling Gravatars in gitlab.yml settings
Closes #1237
2012-08-15 21:06:08 -04:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher b039a16946 GFM refactor: Move the actual parsing to a class under the Gitlab module 2012-08-14 04:37:18 -04:00
Robert Speicher e31a9dd253 GFM refactor: Update pattern to avoid an extra HTML entities check 2012-08-14 04:33:46 -04:00
Robert Speicher d1d19aecde GFM refactor: Simplify the regex pattern
Makes use of 'extended' patterns to add comments to the groups, and also
reduces the total number of groups to just those that are used.
2012-08-14 04:33:41 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee
Continues #1222
2012-08-13 20:49:18 -04:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone
Closes #1222
2012-08-13 01:38:00 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
randx 04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
randx 6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
Riyad Preukschas 6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Riyad Preukschas 0a60b19b23 Remove the commit_msg_with_link_to_issues helper and specs 2012-08-02 02:54:10 +02:00
Riyad Preukschas 6873d07f62 Add link_to_gfm helper and specs 2012-08-02 02:54:01 +02:00
Riyad Preukschas 8ce390333a Add GFM helper 2012-08-02 02:41:49 +02:00
Riyad Preukschas e1b4e22e5c Add render context to markdown renderer 2012-08-01 17:37:12 +02:00
miks 1127c98490 Add automatic HTML id attributes to markdown headings to allow linking
to content sections in wiki
2012-07-26 11:47:17 +03:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets 4e0c2f00d3 Merge pull request #1026 from gitlabhq/inline_diff
Inline diff
2012-07-04 22:45:52 -07:00
Dmitriy Zaporozhets 031ae7756e Refactored navigation 2012-07-03 20:52:48 +03:00
Valeriy Sizov cecdb0b384 InlineDiff: refactoring 2012-07-02 23:34:25 +03:00
Valeriy Sizov a09558921b InlineDiff: base implementation 2012-07-02 23:08:07 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
randx a4ae4694a2 Fix issue #987 #972 2012-06-28 00:54:53 +03:00