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

676 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
49b024f5f5 Use Gitlab::Git:: for git features across application 2013-04-01 16:04:35 +03:00
Dmitriy Zaporozhets
685681e28a remove Tree/Commit decorator usage from controllers 2013-03-31 23:46:25 +03:00
Dmitriy Zaporozhets
26323046fd Decorate Gitlab::Git::Commit with Commit 2013-03-31 19:00:45 +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
6005ec894a Merge pull request #3392 from hiroponz/fix-non-ascii-char-username 
Fix RoutingError when changing username to non ascii char.
 2013-03-30 15:07:11 -07:00
Dmitriy Zaporozhets
ba59912072 Prepare UI for notification settings 2013-03-27 20:07:52 +02:00
Dmitriy Zaporozhets
d55ade1686 notification scaffold 2013-03-27 19:04:29 +02:00
Nihad Abbasov
7ed0dc0185 use convenient method to check for empty project repo 2013-03-26 07:14:57 -07:00
Sato Hiroyuki
33e236c631 Fix RoutingError when changing username to non ascii char. 2013-03-26 14:47:11 +09:00
Dmitriy Zaporozhets
d0df8a6ff8 remove project edit from admin area. Redesigned project page in admin area 2013-03-25 11:07:11 +02:00
Dmitriy Zaporozhets
e292d7c17b Make transfer action in project controller 2013-03-25 10:48:30 +02:00
Dmitriy Zaporozhets
29b0ac489b move edit to separate controller. This fixes #3265 2013-03-24 11:57:44 +02: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
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
Dmitriy Zaporozhets
57f3409bcc move Wall to own resource 2013-03-19 12:35:42 +02:00
Dmitriy Zaporozhets
7587a3b2fc fixed check for snippets module enabled 2013-03-18 23:44:57 +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
ae06a0aab8 Return own tab for wall. Improve Wiki nav. Removed attachments listing page 2013-03-18 22:43:14 +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
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
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
ef05423f47 Finish select2-ajax for users. Added Select2Helper for tests 2013-03-14 10:16:27 +02: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
fa9a8c3847 Remove team_member show page -> use user_path instead 2013-03-13 19:16:36 +02:00
Andrew8xx8
072883fd08 Search projects on dashboard was not worked. Fixed 2013-03-12 13:26:45 +04: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
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
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
Dmitriy Zaporozhets
9dc46eee8e Return project description back 2013-03-06 22:56:48 +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
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
907c334fe0 fix decorate call for milestone users 2013-03-02 13:23:30 +02:00
Dmitriy Zaporozhets
dbcf4144ee use simple decorate on single commits 2013-03-01 15:35:22 +02:00
Dmitriy Zaporozhets
6aead7991f fix decorate calls on collections after draper update 2013-03-01 15:24:59 +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
bca72eac74 Default issue tracker name added to gon variables 2013-02-28 16:11:14 +04:00
Sato Hiroyuki
2a687dd562 Show gravatar icon on tooltip. 2013-02-28 14:56:27 +09:00
Dmitriy Zaporozhets
92039dd677 Developers can merge MR if target branch is not protected 2013-02-27 20:20:31 +02:00
Sato Hiroyuki
d8a40d8c93 Move graph module from lib or vendor directory to app directory. 
Because not autoloading lib directory at development mode.
 2013-02-26 20:31:39 +09:00
Dmitriy Zaporozhets
5ac5510fd6 Fix automerge detection client-side since #3056 2013-02-26 10:47:27 +02:00