Dmitriy Zaporozhets
57f3409bcc
move Wall to own resource
2013-03-19 12:35:42 +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
473efc82b6
Group and team rss is valid now
2013-03-10 12:16:57 +02: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
bb63459d53
Fix routing errors.
...
It should fix #2598 .
2013-03-06 16:36:10 +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
b1f58fcaea
allow any attachment filenames
2013-02-28 19:29:21 +02:00
Sebastian Ziebell
eefb27f5ae
Merge branch 'master' into fixes/api
...
Conflicts:
spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00
Dmitriy Zaporozhets
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
Sebastian Ziebell
375caeefcf
Merge branch 'master' into fixes/api
2013-02-13 10:31:06 +01:00
Sebastian Ziebell
449380265a
Merge branch 'master' into fixes/api
2013-02-12 10:17:57 +01:00
Yuri Feldman
2d0c3e4c6d
Fix for incorrect routing to the Compare controller
2013-02-12 19:28:48 +11:00
Dmitriy Zaporozhets
a699ebdbcc
handle attahcment with send_file
2013-02-11 21:31:19 +02:00
Dmitriy Zaporozhets
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Sebastian Ziebell
8045a81bcf
Merge branch 'master' into fixes/api
2013-02-08 10:32:42 +01:00
Dmitriy Zaporozhets
e6002bdaff
Ability to manage and remove group as owner outside of admin area
2013-02-01 19:04:11 +02:00
Felix Gilcher
c72910a8bf
log fatal errors that we catch
...
In case we rescue from a fatal error, we want the error and the backtrace to
the error logged, so we can debug later on. This change injects the configured
logger from the rails app to the grape API and logs error as well as backtrace
in a rails-like fashion.
2013-02-01 10:23:23 +00:00
Sato Hiroyuki
525a8cd3e9
Switchable the main branch on network graph
2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets
6b01196fb2
Dashboard to resource
2013-01-27 12:56:20 +02:00
Dmitriy Zaporozhets
bd3b677b86
Add projects page to dashboard. Remove projects pagination on dashboard
2013-01-27 12:34:27 +02:00
Dmitriy Zaporozhets
0125b74b3c
Fix application crashes after #2772
2013-01-26 12:08:34 +02:00
Andrey Kumanyaev
6efda51cc5
fix edit project members access link and page fixes refs #2745
2013-01-25 21:20:15 +04:00
Dmitriy Zaporozhets
74e329064a
teams refactoring and cleanup pt.1
2013-01-25 16:36:14 +02:00
Dmitriy Zaporozhets
ca752e64fb
Fix mispelling and ambiguous id in UserTeam.without_project
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
d721863382
Fix little bugs
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
31d84d71d3
assign team to project from project page in public section
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
7658f8c151
update routes
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
1dd0feacc7
move Team_members controller into project (conflicts with team/members controller)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
17a8ee57fe
Remove old data
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
b7470440ff
Move team project management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
9804b7df68
Move admin team members management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
a96cf3ad09
Team projects public section
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
ea6f46cb87
Team members public section
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
695becc4cb
Add teams into Public sections
2013-01-24 22:31:23 +02:00
Andrey Kumanyaev
82499a4cbf
Admin teams section added
2013-01-24 22:31:23 +02:00
Dmitriy Zaporozhets
f6c482c06f
User can create group
2013-01-24 17:47:09 +02:00
Dmitriy Zaporozhets
96d97c4857
Fix routing. Finalize user show page
2013-01-22 19:45:13 +02:00
Dmitriy Zaporozhets
70690e1971
base implementation
2013-01-22 19:05:01 +02:00
Riyad Preukschas
8a5b770c36
Reorder help routes
2013-01-19 15:26:23 +01:00
Riyad Preukschas
8db80f1f6d
Rename help#public_area to help#public_access
2013-01-19 15:24:51 +01:00
Marin Jankovski
296cdd591f
Add optional signup.
2013-01-18 11:57:31 +01:00
Dmitriy Zaporozhets
68bfcd0521
Add public filter to admin projects
2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets
4c6224aad1
Public git read-only access via http
2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets
71bd956866
email via sidekiq. start and stop rake tasks
2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets
c7bb3a1f72
sidekiq
2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
aa97ff7fde
Fixed tree logs for branches with slash. Fixed remember of path when switch branch
2013-01-09 09:34:26 +02:00
Johannes Schleifenbaum
ff976bc86c
fix grack accessing files beginning with .git
2012-12-31 23:33:00 +01:00
Chris Frohoff
21e55ca318
added RAILS_RELATIVE_URL_ROOT support
2012-12-28 18:11:28 +00:00
