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

2687 commits

Author SHA1 Message Date
Dmitriy Zaporozhets e292d7c17b Make transfer action in project controller 2013-03-25 10:48:30 +02:00
Dmitriy Zaporozhets ff35b37fd2 transfer also wiki repository when transfer a project 2013-03-25 10:47:47 +02:00
Dmitriy Zaporozhets 1fb99264a9 Use TransferContext for project 2013-03-25 10:47:22 +02:00
Dmitriy Zaporozhets 850881a2ef add admin ability to edit project settings from project area 2013-03-25 10:46:57 +02:00
Dmitriy Zaporozhets 29b0ac489b move edit to separate controller. This fixes #3265 2013-03-24 11:57:44 +02:00
Dmitriy Zaporozhets b6641d6932 Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file 2013-03-24 11:26:57 +02:00
Dmitriy Zaporozhets c0da61c6d8 fix xss issue in blame 2013-03-22 18:52:25 +02:00
Dmitriy Zaporozhets de2c189ec1 fix blame view head nav 2013-03-22 15:11:16 +02:00
Dmitriy Zaporozhets 84043e8e44 Fix lines and line numbers being squashed in File -> blame 2013-03-22 15:08:02 +02:00
Sato Hiroyuki f5e001bd8c Using arrowed line only if it connects to not first parent. 
It is easy to see which branch is merged.
 2013-03-22 16:09:21 +09:00
Sato Hiroyuki 26606aa2ec Fix style of network graph. 
refs #3258
 2013-03-22 10:11:53 +09:00
Dmitriy Zaporozhets 5f9d654939 Dont show '0 additions and 0 deletions' message for commit 2013-03-21 22:50:18 +02:00
Dmitriy Zaporozhets ad5ea14210 Move commit.show partial from commits/ to commit/ 2013-03-21 22:22:54 +02:00
Dmitriy Zaporozhets fec283889b fix commit-description css on commit.show 2013-03-21 22:22:21 +02:00
Dmitriy Zaporozhets c4299bb45a Move directory logic out of model. Use Gitlab:Shell class to interact with file system 2013-03-21 22:11:08 +02:00
Dmitriy Zaporozhets 0103363191 replace Gitolited mixin with Gitlab::ShellAdapter 2013-03-21 21:01:14 +02:00
Dmitriy Zaporozhets d6338a8482 Merge pull request #3258 from hiroponz/display-commit-msg 
Display commit message on network graph.
 2013-03-21 09:58:57 -07:00
Sato Hiroyuki a1fe375e44 Fix 404 error while displaying json files. 
It uses params[:id] instead of request.fullpath.
It should fix #3132.
 2013-03-21 15:10:14 +00:00
Sato Hiroyuki a19e3d898d Display icon and commit message on network graph. 2013-03-21 13:08:54 +00:00
Sato Hiroyuki 916c61fc64 Refactor: clean up code. 2013-03-21 12:34:15 +00:00
Robert Biro f39d3b9a09 Fix column heading order in group admin view 2013-03-20 22:15:42 +00:00
Dmitriy Zaporozhets 3cdac0b934 Use Api.js to handle api calls to gitlab 2013-03-20 21:55:25 +02:00
Dmitriy Zaporozhets a163135cb5 Intead of showing 404 give users ability to close MR with missing branches 2013-03-20 20:22:29 +02:00
Dmitriy Zaporozhets c71a7896b1 fix test button functionality for project -> service -> gitlab ci 2013-03-20 16:41:59 +02:00
Sato Hiroyuki 1f6b6b6c62 Rotating graph orientation. 2013-03-20 12:28:22 +00:00
Dmitriy Zaporozhets 6347e9a60b Dont load diff in compare over 100 commits 2013-03-20 10:19:00 +02:00
Dmitriy Zaporozhets 72db22d385 send wall message with crtl+enter 2013-03-20 09:53:39 +02:00
Dan Knox 8300ae366c Fix the Cancel button on the Edit Wiki page. 
The Cancel button on the Edit Wiki page was still redirecting back
to the "Index" page which is no longer the default Wiki page.

This commit changes the Cancel button in the following ways:

  * Pressing Cancel while editing an existing Wiki page will now
    redirect you back to the latest version of that page.
  * Pressing Cancel while editing a brand new Wiki home page that
    does not yet exist will redirect you to back to the same Edit
    Wiki Home page.
 2013-03-19 21:36:09 -07:00
Dmitriy Zaporozhets 6880ace1fe Fix bug showing merge MR in milestone open list 2013-03-19 20:11:47 +02:00
Dmitriy Zaporozhets a3cdaeef66 refactor emails a bit. Add email on ssh key creation 2013-03-19 20:00:41 +02:00
Dmitriy Zaporozhets 8ec01e0ba9 remove ajax loader from wall 2013-03-19 18:14:59 +02:00
Dmitriy Zaporozhets 3b42c267a6 Dont show blocked users in autocomplete 2013-03-19 18:07:14 +02:00
Dmitriy Zaporozhets 07a88d6699 Merge pull request #3255 from michelsalib/patch-1 
Gitlab does not use gitolite anymore.
 2013-03-19 08:59:10 -07:00
Dmitriy Zaporozhets 4403f71f45 added sanitize and linkify functions. Moved some js to lib/ 2013-03-19 15:54:58 +02:00
Dmitriy Zaporozhets e6c2080214 use scrollTop solution for both chrome & firefox 2013-03-19 15:04:58 +02:00
Dmitriy Zaporozhets ba4f0abf47 wall comment does not create an event on dashboard any more 2013-03-19 14:50:26 +02:00
Dmitriy Zaporozhets b1bd3f1252 fix tests. added jquery.timeago.js 2013-03-19 14:39:32 +02:00
Dmitriy Zaporozhets 124a5e270e add attachemnts support for wall 2013-03-19 13:28:29 +02:00
Michel Salib e2ddf03c7e Gitlab does not use gitolite anymore. 2013-03-19 11:52:59 +01:00
Dmitriy Zaporozhets 4d378f3c9a load notes for wall via api 2013-03-19 12:35:55 +02:00
Dmitriy Zaporozhets 57f3409bcc move Wall to own resource 2013-03-19 12:35:42 +02:00
Dmitriy Zaporozhets f3dfd22993 add wall.scss 2013-03-19 12:34:59 +02:00
Dmitriy Zaporozhets 5bf3a898ed Remove wall from basic notes logic 2013-03-19 12:34:14 +02:00
Sato Hiroyuki 175e09f167 Change graph element size. 2013-03-19 19:27:15 +09:00
Sato Hiroyuki 351c952192 Refactor: extract method. 2013-03-19 18:42:46 +09:00
Sato Hiroyuki 96a584211b Refactor: Clean up code. 2013-03-19 18:08:27 +09:00
Dmitriy Zaporozhets 1752c6dc8b Uncheck notify team checkbox by default 2013-03-19 09:38:33 +02:00
Dmitriy Zaporozhets e68955b4fc add permission messages to project edit 2013-03-19 09:27:12 +02:00
Dmitriy Zaporozhets 54f40301ff fixed form input overflow on 1024px res 2013-03-19 08:39:26 +02:00
Sato Hiroyuki e00e54b69c Fix timeout error while showing the very large repo like git repo. 2013-03-19 10:36:40 +09:00
Sato Hiroyuki 46fa92187d Refactor: removing duplicate code. 2013-03-19 10:00:29 +09:00
Dmitriy Zaporozhets 7587a3b2fc fixed check for snippets module enabled 2013-03-18 23:44:57 +02:00
Dmitriy Zaporozhets 747292e2d3 reorder features list in project -> edit page 2013-03-18 23:38:16 +02:00
Dmitriy Zaporozhets b765a7958d Move snippets to own tab as feature. Make it disabled for new projects by default 2013-03-18 23:33:41 +02:00
Dmitriy Zaporozhets 112dc875ba feature: wiki -> new page 2013-03-18 23:08:54 +02:00
Dmitriy Zaporozhets ae06a0aab8 Return own tab for wall. Improve Wiki nav. Removed attachments listing page 2013-03-18 22:43:14 +02:00
Dmitriy Zaporozhets 6956f1f6e1 Improve usability of project edit page 2013-03-18 20:50:41 +02:00
Dmitriy Zaporozhets 0c884498d2 Rename project_head partial to settings_nav 2013-03-18 19:35:27 +02:00
Dmitriy Zaporozhets 0eccc08015 show project description in project listing on dashboard 2013-03-18 19:22:15 +02:00
Dmitriy Zaporozhets aa5327a565 Fix project_limit being ignored on signup 2013-03-18 13:22:41 +02:00
Kevin Lyda 415bade302 Result of misspellings run. 
Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.
 2013-03-17 19:46:54 +00:00
Dmitriy Zaporozhets c367cc5ca6 Show projet name with namespace on team _projects widget 2013-03-16 14:40:16 +02:00
Dmitriy Zaporozhets d75cb57f9c remove separator between search & icons in header 2013-03-15 17:35:54 +02:00
Dmitriy Zaporozhets 94f0493999 few fixes afte merge gollum wiki 2013-03-15 17:21:01 +02:00
Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 
Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb
 2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets 4f23c30ace Fix highlight line for solarized theme 2013-03-15 16:20:40 +02:00
Dmitriy Zaporozhets 2449bea2c4 restyle header a bit 2013-03-15 15:39:47 +02:00
Dmitriy Zaporozhets 21b1fee92c reannotated 2013-03-15 15:16:02 +02:00
Dmitriy Zaporozhets 2a04341fba finish up with solarized dark 2013-03-15 15:14:56 +02:00
Dmitriy Zaporozhets 8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +02:00
Dmitriy Zaporozhets 35ad4fe7db Use wiki tab for wiki, wall, snippets 2013-03-15 14:20:03 +02:00
Dmitriy Zaporozhets 5bf88506ec rename writeboards to wiki 2013-03-15 09:39:07 +02:00
Dmitriy Zaporozhets 2681a01bcf add resize button for better wiki reading 2013-03-14 22:57:38 +02:00
Dmitriy Zaporozhets a685624d27 Merge wiki, wall & snippets under one tab - writeboards 2013-03-14 22:24:27 +02:00
Dmitriy Zaporozhets 38ecec4472 Remove tree single-tab panel 2013-03-14 19:50:57 +02:00
Dmitriy Zaporozhets 5c4e74acc3 Add settings tab to project. Move all project administration there 2013-03-14 19:28:29 +02:00
Dmitriy Zaporozhets da3bc14d80 removed mistype 2013-03-14 14:02:56 +02:00
Dmitriy Zaporozhets a8b1f8c0e5 use refresh icon instead loader gif 2013-03-14 14:02:24 +02:00
Dmitriy Zaporozhets 88d42c2e1c Replace projects_box with ui-box. Fixed team spinach test 2013-03-14 13:12:11 +02:00
Dmitriy Zaporozhets e84df44ea0 Redesign search filters 2013-03-14 13:11:20 +02:00
Dmitriy Zaporozhets 4673c85379 add teams to search autocomplete 2013-03-14 12:43:08 +02:00
Dmitriy Zaporozhets 441d256188 Rebuild team area 2013-03-14 12:38:43 +02:00
Dmitriy Zaporozhets f4f36f78dd Remove separate search page from group 2013-03-14 12:37:28 +02:00
Dmitriy Zaporozhets cc1dd624aa Restyled group -> edit area. Use select2 for transfer autocomplete 2013-03-14 11:31:33 +02:00
Dmitriy Zaporozhets 2f6d289f32 style select2-searching too 2013-03-14 10:20:45 +02:00
Dmitriy Zaporozhets ef05423f47 Finish select2-ajax for users. Added Select2Helper for tests 2013-03-14 10:16:27 +02:00
Dan Knox d69a37e0b7 Fix whitespace on MARKUPS constant in GollumWiki class. 2013-03-14 00:07:01 -07:00
Dan Knox 6d25484417 Limit available Wiki formats to Markdown and RDoc. 2013-03-13 23:34:50 -07:00
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
Dmitriy Zaporozhets 10f14136f5 fix setting gon.api_token 2013-03-13 23:45:47 +02:00
Dmitriy Zaporozhets bdcaf21ea7 Allow single/multiple user select 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets 7316055ac8 multiselect for ajax-users-select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets bf17d976a7 add api users filter and integrate users select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets 163908b393 user select2 javascript 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets 1bba46d661 md5 and utf_encode js libraries 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets d1a5e370f3 show mail-to and block buttons on /admin/users/:id page 2013-03-13 23:15:39 +02:00
Dmitriy Zaporozhets 496b7da7a0 Fix spinach tests 2013-03-13 21:58:32 +02:00
Dmitriy Zaporozhets 1587caa3e4 Use name+username in team -> new 2013-03-13 19:24:30 +02:00
Dmitriy Zaporozhets fa9a8c3847 Remove team_member show page -> use user_path instead 2013-03-13 19:16:36 +02:00
Dmitriy Zaporozhets 70fc1c5021 cleanup ProjectMover 2013-03-12 14:13:25 +02:00