Commit Graph
447 Commits
Author SHA1 Message Date
Robert Speicher cb9cf077de Refactor and cover search_autocomplete_source 2013-10-20 01:05:20 -04:00
Robert Speicher bb494203d2 Cover the simple_sanitize helper 2013-10-19 23:57:34 -04:00
Dmitriy Zaporozhets 2cd3d42181 Use gitlab_config intead of Gitlab.config.gitlab in views 2013-10-17 22:11:41 +03:00
Dmitriy Zaporozhets ec337276c6 Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhq 2013-10-17 12:58:15 +00:00
Marin Jankovski 52739518bc Make clearer use of the check. 2013-10-17 11:36:23 +02:00
Marin Jankovski 78e591c737 Use more descriptive name for config check. 2013-10-17 10:57:58 +02:00
Marin Jankovski ff046c7200 Fallback to internal issue tracker if config is invalid. 2013-10-17 10:42:39 +02:00
Dmitriy Zaporozhets 91a31d767f Order milestone due date on issues page filter 2013-10-17 10:01:48 +03:00
Marin Jankovski e649ea2fc5 Links in Readme in tree view. 2013-10-14 16:47:46 +02:00
Dmitriy Zaporozhets b883d94f96 Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:00:05 +00:00
Marin Jankovski 4654999288 Merge branch 'master' into relative_links_in_documentation 2013-10-10 15:09:12 +02:00
Marin Jankovski 5b23a7bbb9 Cover a special case. 2013-10-10 14:29:16 +02:00
Marin Jankovski 5277ac1b15 Added comments and split the methods further. 2013-10-10 11:16:15 +02:00
Sytse Sijbrandij b0502c20a9 Consistent naming to make difference between clicking on profile pic and profile settings clear. 2013-10-10 10:43:24 +02:00
Dmitriy Zaporozhets d1ffbdfcb6 Avoid 500 error on project page when application is close to RAM limit 2013-10-10 11:05:49 +03:00
Dmitriy Zaporozhets bd83991ac7 Use link_to_project helper 2013-10-10 10:53:49 +03:00
Marin Jankovski 7dbbb6defe Rename method to avoid clashes. 2013-10-09 15:01:02 +02:00
Marin Jankovski 70f828cd4b Split. 2013-10-09 13:28:25 +02:00
Dmitriy Zaporozhets a37b8ab2b2 Merge pull request #5291 from astratto/title_issue_trackers
Use proper titles for issues trackers
2013-10-09 04:10:09 -07:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Marin Jankovski 3682a0820b Match the brackets so we don't replace the regular text. 2013-10-08 15:44:52 +02:00
Marin Jankovski 06d6f44367 Check for wiki. 2013-10-08 14:21:01 +02:00
Marin Jankovski 817399e3be Show links with correct ref. 2013-10-08 13:07:59 +02:00
Marin Jankovski 810d90dd26 Search and replace relative links in tree/readme 2013-10-08 12:24:50 +02:00
Dmitriy Zaporozhets 970d86b7c5 Refactor blob finding 2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Dmitriy Zaporozhets 069a6dfa91 Compare link for branches 2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets ed72e949f2 Right branches for mr link at Compare view 2013-09-12 20:23:03 +03:00
Dmitriy Zaporozhets f774949d3f Compare page improved
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
2013-09-12 20:15:10 +03:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets 94d364e8cc UI fixes for commits lists 2013-09-10 13:15:49 +03:00
Dmitriy Zaporozhets 3832b2aa67 Improve Profile#account page 2013-09-04 00:53:01 +03:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets d04ad4cb5d Merge pull request #4812 from hiroponz/remove-dependancy-of-grit
Remove the dependancy of grit from class Network::Graph
2013-08-20 12:09:35 -07:00
Dmitriy Zaporozhets 9174020f14 Fix event image preview 2013-08-20 21:20:11 +03:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Hiroyuki Sato fd0afcc996 Remove the dependancy of grit from class Network::Graph 2013-08-20 12:05:23 +09:00
Dmitriy Zaporozhets 434c034159 Iid improvemets
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
2013-08-19 22:53:11 +03:00
Dmitriy Zaporozhets 3281021e8b Rewrite issues/mr filtering logic 2013-08-10 20:25:53 +03:00
Dmitriy Zaporozhets fb36355f2f Different search placeholder depdends on area 2013-08-10 19:12:25 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets 512cd02335 Dashboard/Group issues and mr pages refactoring 2013-08-06 21:12:01 +03:00
Dmitriy Zaporozhets af5faaf0e1 Move diff parsing to own class. Correctly identify note diff line 2013-08-04 20:43:49 +03:00
Dmitriy Zaporozhets 8f05fbbab5 Dont show comment on diff if diff line was changed after comment left 2013-08-04 19:35:47 +03:00
Dmitriy Zaporozhets b99f357e96 Dont allow file edit for non-branches ref 2013-08-04 17:18:49 +03:00
Robert Schilling 9efdebaf12 Improve markup detection, fixes #4695 2013-08-03 14:40:43 +02:00