Commit graph

195 commits

Author SHA1 Message Date
Riyad Preukschas fb0279f311 Fix vote counting to only count main target notes (not mixed in ones) 2012-10-10 12:09:45 +02:00
Riyad Preukschas 3f72af9994 Make notes for merge requests include commit notes and add helpers 2012-10-10 12:06:30 +02:00
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
randx 679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
Riyad Preukschas bbd92e57cb Add emoji_for_completion helper 2012-10-09 14:47:42 +02:00
Andrey Kumanyaev df7c52489a simple refactoring 2012-10-09 04:10:04 +04:00
Robert Speicher 388d72e6bf Add render_tree helper; simplify (speed up) tree_icon 2012-10-03 19:39:27 -04:00
Dmitriy Zaporozhets 69751aac32 Refactoring event views 2012-10-01 16:58:13 +03:00
Dmitriy Zaporozhets 663dd6fad6 Refactored events output. Added links to authors of events 2012-10-01 16:39:19 +03:00
Robert Speicher 1502be325d Minor doc fix 2012-09-27 13:12:11 -04:00
Dmitriy Zaporozhets 2c8d3c33ff Fixed ref switcher 2012-09-27 09:53:42 +03:00
Robert Speicher 36f68140d1 Replace various "active tab" checks with nav_link
Also remove now-unused tab_class helper
2012-09-26 16:38:28 -04:00
Robert Speicher f064c84019 Add nav_link helper to TabHelper 2012-09-26 16:32:26 -04:00
Robert Speicher aa0c4b77b6 Add current_action? helper 2012-09-26 16:32:26 -04:00
Robert Speicher b62d6a1fe2 Remove commit_tab_class helper 2012-09-26 16:32:25 -04:00
Robert Speicher 51c1e49900 Change active tab and nav class to "active"
The main nav used active, the sub nav used current. This normalizes it.
2012-09-26 16:32:24 -04:00
Robert Speicher adcc6a0b0e Move tab_class helper to TabHelper 2012-09-26 16:32:24 -04:00
Robert Speicher 60ac6a28a2 Allow current_controller? helper to take an Array of options 2012-09-26 16:32:24 -04:00
Robert Speicher 3ad931ca92 Add current_controller? helper method
Simplifies some of the "active tab" checks we're doing
2012-09-26 16:32:23 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Dmitriy Zaporozhets 0e524aaea1 Added workaround for github-markup issue with rendering markdown 2012-09-20 13:00:18 +03:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04:00
Dmitriy Zaporozhets 2aafd7cf4e Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes 2012-09-18 08:56:54 +03:00
Robert Speicher 95bd93fe1a Remove Projects#team action
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
Riyad Preukschas b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00
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