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

1618 commits

Author SHA1 Message Date
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 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
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 bdcaf21ea7 Allow single/multiple user select 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 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 6755d9908f Merge pull request #3196 from Undev/feature/broken-projects-search-23049 
Broken projects search on dashboard
 2013-03-12 04:31:57 -07:00
Dmitriy Zaporozhets 102695530b fix project move email 2013-03-12 12:40:49 +02:00
Andrew8xx8 23f8f13ea4 Search fields were have same id's. Fixed 2013-03-12 13:41:23 +04:00
Dmitriy Zaporozhets b1e425511f restyle and cleanup emails 2013-03-12 10:46:04 +02: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
Dmitriy Zaporozhets 473efc82b6 Group and team rss is valid now 2013-03-10 12:16:57 +02:00
Dmitriy Zaporozhets 8812d9dee2 Move groups and teams to tabs on dashboard. Remember tab with cookie 2013-03-10 11:57:14 +02:00
Dmitriy Zaporozhets 96c627edd8 Merge pull request #3169 from hiroponz/refactor-network-graph 
Refactor network graph
 2013-03-10 01:00:14 -08: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 9c709be335 fix event relative date being cached 2013-03-08 13:14:47 +02:00
Sato Hiroyuki b7e5f4556b Refactor: Removing the duplicated code. 2013-03-07 21:10:27 +09: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
Sato Hiroyuki 784aa266bd Refactor: grouping parent and their space by including array. 2013-03-07 15:19:42 +09:00
Sato Hiroyuki 2f7f46b256 Refactor: replace "render :json = graph.to_json" to view template(show.json.erb). 
Because model shouldn't know about view logic.
 2013-03-07 15:19:32 +09:00
Dmitriy Zaporozhets 9dc46eee8e Return project description back 2013-03-06 22:56:48 +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
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 f22488f726 Merge pull request #3143 from Undev/state-machine-3 
State machine 3
 2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets 9bb35e7e59 Prevent app crash if team owner removed 2013-03-05 09:27:06 +02: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 dc7507cfe7 = preserve do was ignored for empty project page so was replaced with filter 2013-03-04 21:12:36 +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 ef646928e4 better presenting for group description 2013-03-01 16:26:26 +02: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 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
Andrew8xx8 9c747fbb95 Missing descriptions added 2013-02-28 17:37:02 +04:00
Andrew8xx8 9959669f1c Desctiptions removed from dashboard 2013-02-28 17:15:22 +04:00
Andrew8xx8 5f657203a1 Description added to temas 2013-02-28 17:15:22 +04:00
Andrew8xx8 9f45e01e84 Description to groups added 2013-02-28 17:14:21 +04:00
Andrew8xx8 cff845784e Show Issues tracker select only if one or more remote issue trackers available 2013-02-28 16:11:14 +04:00
Andrew8xx8 b6d0f2852d Issues link from project page follows on remote bug tracker if it selected now 2013-02-28 16:11:14 +04:00
Andrew8xx8 cf3cf3750e Gem gon added. It produces server-side variable values in javascript 2013-02-28 16:11:14 +04:00
Andrew8xx8 0afdf39dbc New field added 2013-02-28 16:11:13 +04:00
Andrew8xx8 999fc2391b Issue tracker added to edit project form in admin area 2013-02-28 16:10:00 +04:00
Andrew8xx8 e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Dmitriy Zaporozhets fa6bf2c0f5 remove unnecessary center tag in devise layout 2013-02-28 12:08:25 +02:00
Dmitriy Zaporozhets 54d95f5897 Restyle flash message. Not it does not overflow head panel 2013-02-28 11:06:52 +02:00
Dmitriy Zaporozhets 92039dd677 Developers can merge MR if target branch is not protected 2013-02-27 20:20:31 +02:00
Dmitriy Zaporozhets 5ac5510fd6 Fix automerge detection client-side since #3056 2013-02-26 10:47:27 +02:00
Dmitriy Zaporozhets d7b667fee2 Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2 
Conflicts:
	app/models/merge_request.rb
 2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets 0cc95ef2f5 Merge pull request #2889 from kennytm/master 
Show only ≤16 lines of codes in a discussion in a MR (issue #2860).
 2013-02-26 00:32:02 -08:00
Dmitriy Zaporozhets 573942263a Fix issue edit button showup 2013-02-26 10:17:09 +02:00
Dmitriy Zaporozhets 39fe9b644f Add close issue to note actions bar 2013-02-25 23:10:50 +02:00
Dmitriy Zaporozhets 8de19b259e proper name for issue partial 2013-02-25 22:56:10 +02:00
Dmitry Medvinsky 30180ed82e Add title for "Remove from team" button 2013-02-22 20:29:03 +04:00
Dmitriy Zaporozhets 5aeaf248f1 Fixing rspec after upgrade to capybara pt1 2013-02-21 13:09:47 +02:00
Dmitriy Zaporozhets 42ce2c1080 improve selectors to pass capybara 2.0 2013-02-21 11:27:22 +02:00
Andrew8xx8 6d68923edc human_merge_status replaced by human_merge_status_name 2013-02-20 17:50:29 +04:00
Andrew8xx8 e2d94e0719 State machine added for merge_status field 2013-02-20 17:49:48 +04:00
Dmitry Medvinsky eb58529757 Add commit full time tooltip to commited_ago 2013-02-19 19:56:43 +04:00
Dmitriy Zaporozhets 155703c613 Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine 
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
 2013-02-19 11:01:19 +02:00
Dmitriy Zaporozhets ba937b2b3d Dont show assigned_teams block unless any. Show count in filter 2013-02-18 21:21:24 +02:00
Dmitriy Zaporozhets a29db26cc9 Refactor and restyle team page for project 2013-02-18 21:10:49 +02:00
Dmitriy Zaporozhets e9d8d074a1 no projects message in group area 2013-02-18 20:31:43 +02:00
Dmitriy Zaporozhets e049e18780 Merge pull request #2991 from raphendyr/username_change_disablation 
Add option to disable username changing
 2013-02-18 09:59:24 -08:00
Dmitriy Zaporozhets 97de6f851b Fix not-working team memebership permissions change 2013-02-18 16:40:11 +02:00
Andrew8xx8 557a9fa321 Debug remomved 2013-02-18 17:16:29 +04:00
Andrew8xx8 ff94f29be5 States events fixed 2013-02-18 16:49:56 +04:00
Dmitriy Zaporozhets 1481d1cfe0 Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq 2013-02-18 12:46:45 +00:00
Dmitriy Zaporozhets 01a7250ba5 Add user to team he creates 2013-02-18 14:35:38 +02:00
Marin Jankovski 1734611181 Count owned projects, not just personal 2013-02-18 13:15:35 +01:00
Andrew8xx8 6074896cbf Spinach tests fixed 2013-02-18 14:43:50 +04:00
Andrew8xx8 1644117a1a Issue uses StateMachine now 2013-02-18 14:43:50 +04:00
Andrew8xx8 0b512af803 Milestone uses StateMachine now 2013-02-18 14:43:50 +04:00
Andrew8xx8 b45e9aefd3 Merge Request uses StateMachine now 2013-02-18 14:43:50 +04:00