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

671 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
154e54b46e Remove grit logic from app/ 2013-03-31 18:49:58 +03:00
Dmitriy Zaporozhets
71b0f8ea0b Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name) 2013-03-31 17:08:10 +03:00
Dmitriy Zaporozhets
1c5a393c95 Merge pull request #3406 from docwhat/in_projects 
Fixed UsersProject.in_projects
 2013-03-30 15:03:44 -07:00
Dmitriy Zaporozhets
a18ce40943 Revert "First step with rugged" 
This reverts commit 4524ba20b8.
 2013-03-28 23:01:42 +02:00
Dmitriy Zaporozhets
4524ba20b8 First step with rugged 2013-03-28 21:57:38 +02:00
Dmitriy Zaporozhets
5ad4be295f remove notify checkboxes from note forms 2013-03-28 15:39:18 +02:00
Dmitriy Zaporozhets
d55ade1686 notification scaffold 2013-03-27 19:04:29 +02:00
Dmitriy Zaporozhets
5f14a6bcf8 annotated 2013-03-27 18:26:37 +02:00
Christian Höltje
b8502cbaee Fixed UsersProject.in_projects 
I discovered while trying to use UserTeam#remove_member() that
UsersProject.in_projects was broken.  So I wrote test cases to test what
I was trying to do and fixed the underlying problem.
 2013-03-26 10:19:55 -04:00
Dmitriy Zaporozhets
4b3950456d notification level for user 2013-03-26 10:48:07 +02:00
Dmitriy Zaporozhets
9d92433a7c login with both email or username 2013-03-25 16:10:14 +02:00
Dmitriy Zaporozhets
e292d7c17b Make transfer action in project controller 2013-03-25 10:48:30 +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
5f9d654939 Dont show '0 additions and 0 deletions' message for commit 2013-03-21 22:50:18 +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
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
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
b765a7958d Move snippets to own tab as feature. Make it disabled for new projects by default 2013-03-18 23:33: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
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
21b1fee92c reannotated 2013-03-15 15:16:02 +02:00
Dmitriy Zaporozhets
8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +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
Dmitriy Zaporozhets
bdcaf21ea7 Allow single/multiple user select 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets
1587caa3e4 Use name+username in team -> new 2013-03-13 19:24:30 +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
Sebastian Ziebell
3374027e3a Merge branch 'master' into fixes/api, code clean up and tests fixed 
Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb
 2013-03-07 14:51:56 +01:00
Sato Hiroyuki
b7e5f4556b Refactor: Removing the duplicated code. 2013-03-07 21:10:27 +09:00
Sato Hiroyuki
79cd1ca304 Refactor: change the map hash from a local variable to private variable. 2013-03-07 19:52:46 +09:00
Sato Hiroyuki
ccc712b198 Refacor: removing the times array, because that is same with @commits array. 2013-03-07 19:16:51 +09: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
Sato Hiroyuki
8c5003cf75 Refactor: clean up models. 
* Network::Commit
** Removing unnecessary accessors.
** Removing add_refs methods.
* Network::Graph
** Removing unnecessary accessors.
** The 3 times loop of commits don't need.
 2013-03-07 17:56:01 +09:00
Sato Hiroyuki
e03a018d28 Refactor: rename module and class names. 
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
 2013-03-07 15:42:30 +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
Sebastian Ziebell
61cfa2a7a6 Merge branch 'master' into fixes/api 
Conflicts:
	lib/api/projects.rb
 2013-03-05 22:29:49 +01:00
Dmitriy Zaporozhets
9ba21dd0c4 better solution for #3027 2013-03-05 17:07:12 +02: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
Dmitriy Zaporozhets
3a09f02e11 Merge pull request #3109 from hiroponz/improve-network-graph 
Improve network graph
 2013-03-04 23:02:27 -08:00
Andrew8xx8
0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04: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
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
3d4e32457b Table description indentation fixed 2013-02-28 17:15:22 +04:00