Dmitriy Zaporozhets
a87fccc083
Update projects in gitolite after namespace moved. Added rake task to cleanup garbage from gitolite
2012-12-24 20:02:08 +02:00
Robert Schilling
d62a8a4d50
Changed wording if milestone already expired, using Date#past
2012-12-23 21:16:51 +00:00
Riyad Preukschas
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Riyad Preukschas
5d1044c335
Fix Commit#to_diff
2012-12-22 20:36:33 +01:00
Dmitriy Zaporozhets
1ba28aaef8
Implement UsersProject project_access validation
2012-12-22 19:52:28 +02:00
Dmitriy Zaporozhets
75dd704294
Send update instructions after project namespace id changed or namespace path changed
2012-12-20 22:16:51 +02:00
Riyad Preukschas
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets
e9c6d4adfa
Merge branch 'refactor_issues' of dev.gitlabhq.com:gitlab/gitlabhq
2012-12-20 13:50:42 +00:00
Koen Punt
6d93eafa6a
disabled sorting of commits before compare
2012-12-20 13:50:43 +01:00
Koen Punt
a09d938215
Flipping commit ids in commits_between, fixes #513
2012-12-20 13:31:09 +01:00
Dmitriy Zaporozhets
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
Sergey Linnik
f7e934696c
added more denied project names
2012-12-15 14:33:45 +04:00
Dmitriy Zaporozhets
b79e00881e
Uncommented test observing comment event
2012-12-14 22:05:10 +02:00
Dmitriy Zaporozhets
f03dc8716d
Fix author_id_of_changes mass assignment
2012-12-14 21:48:16 +02:00
Dmitriy Zaporozhets
f2db188dbe
Processing with note events. reformated dashboard for more events to handle
2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets
678e5355a3
Create events on comments and milestone
2012-12-14 19:33:33 +02:00
Dmitriy Zaporozhets
190e483fb4
Rework of milestones
2012-12-14 08:34:05 +03:00
Dmitriy Zaporozhets
b01f8b63c2
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
2012-12-14 08:14:05 +03:00
Dmitriy Zaporozhets
1d156c9c8e
Fix project lookup. Show error if project transfer fails
2012-12-13 19:20:37 +02:00
Cyril
63d9373aa8
Validates presence of User#name
...
The 2 reasons are :
- creation of user fail if name is empty : in after_save, it tries to create a
namespace with namespace.name = user.name and namespece validates presence
Namespace#name
- in the web app links to team members are broken with empty User#name because
they are of the form <a href'...'> user.name </a>
2012-12-12 17:53:43 +01:00
Dmitriy Zaporozhets
7f636b1306
Fix project namespaces for web hooks data
2012-12-11 19:16:56 +02:00
Dmitriy Zaporozhets
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
Dmitriy Zaporozhets
a350b52c9b
Rewrite project security model tests
2012-12-05 17:06:15 +02:00
Riyad Preukschas
b47173da6a
Revamped note form options.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
c4a7824a8c
Fix wall notes
2012-12-03 22:51:56 +01:00
Riyad Preukschas
1319373d58
Fix loading notes with empty line_code in Project#commit_notes
2012-12-03 22:51:56 +01:00
Riyad Preukschas
e8f10f317f
Fix Note validation
...
* remove length restriction on note
* add format validation for line_code
2012-12-03 22:51:56 +01:00
Riyad Preukschas
ae067ee322
Fix vote counting
2012-12-03 22:51:56 +01:00
Riyad Preukschas
5c2f6d7f05
Update notes views to support discussions
2012-12-03 22:51:55 +01:00
Riyad Preukschas
fc1c250d40
Reorder Note methods and add helpers
2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets
e376f31507
Admin can move project to ANY namespace. Updated permissions page
2012-12-04 22:48:24 +02:00
Dmitriy Zaporozhets
2a1c5cdf99
Only owner of current namespace can change project namespace
2012-12-04 22:06:55 +02:00
Nihad Abbasov
24e172597a
remove length limit from notes
2012-12-01 03:19:16 -08:00
Dmitriy Zaporozhets
eb3e07a509
Use project owner if no namespace. Restyled team page
2012-11-30 18:26:17 +02:00
Dmitriy Zaporozhets
c38b9a2f80
Filter projects on dashboard
2012-11-30 13:40:34 +02:00
Dmitriy Zaporozhets
9df6f7bfad
authorized_projects and authorized_groups methods for user
2012-11-29 17:17:01 +02:00
Dmitriy Zaporozhets
1d889a79fb
Fix group duplication on dashboard and project order in group
2012-11-29 16:43:09 +02:00
Dmitriy Zaporozhets
eb1004f789
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
2012-11-29 12:39:03 +02:00
Dmitriy Zaporozhets
a0aa0212a9
Removed feature: comments on wiki
2012-11-29 06:14:05 +03:00
Alex Denisov
34c2d8e82e
authorized_for scope added to project
2012-11-28 20:09:13 +02:00
Dmitriy Zaporozhets
47234ab367
Validate username. Gitlab::Regex added
2012-11-28 06:14:05 +03:00
Dmitriy Zaporozhets
039996bd0a
Fix invalid method call for gitolite
2012-11-27 16:35:00 +02:00
Dmitriy Zaporozhets
f5551efdfd
Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues
2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets
70bf7f6e19
Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo
2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets
23734a715e
Dashboard filters for events
2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets
e750efd9fc
Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
...
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets
2d5a6fc850
Fix dir permission on creation
2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets
7ae851f642
Fix critical issue with dir permission for namespaces
2012-11-26 12:43:32 +02:00
Dmitriy Zaporozhets
1d857aae17
project admin area - show project name with namespace
2012-11-25 18:52:12 +02:00
Dmitriy Zaporozhets
97a92f8ae7
Fixed user.namespace_id exception if namespace is nil
2012-11-25 12:26:34 +02:00
Dmitriy Zaporozhets
c31d48dd25
Allow project creation in scope of group for non-admin but group owners
2012-11-25 11:57:01 +02:00
Riyad Preukschas
b3834bc9b0
Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch
2012-11-25 00:05:47 +01:00
Dmitriy Zaporozhets
2f22874ba6
Fix group assoc. Show namespace in project list
2012-11-24 22:39:51 +02:00
Dmitriy Zaporozhets
65c470e843
Reannotated
2012-11-24 22:16:51 +02:00
Dmitriy Zaporozhets
3f1d6d6ab3
move namespace dir after path changed
2012-11-24 22:11:46 +02:00
Dmitriy Zaporozhets
f37fa968b2
add ability to change namespace from project edit page
2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets
f997947664
Project can be transfered to namespace and out now
2012-11-24 12:37:30 +02:00
Dmitriy Zaporozhets
9304d049de
Fixed some tests and snippet colorize
2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
470aa7675e
Fix project.code-related functionality
2012-11-23 21:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
ab9d023651
Create dir with namespace. Create namespace with user
2012-11-23 09:11:09 +03:00
Dmitriy Zaporozhets
f17ddeb394
Make admin project list more useful
2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets
552b3105fb
Fixed admin area. Create project only from one place
2012-11-23 07:31:09 +03:00
Dmitriy Zaporozhets
2b683b0d0b
Ability to create project with namespace
2012-11-23 07:11:09 +03:00
Dmitriy Zaporozhets
26622f4c8f
Improve routing. Project access via namespace
2012-11-22 23:34:06 +03:00
Riyad Preukschas
246faa3d7a
Add Commit#to_diff for raw diff
2012-11-22 20:49:01 +01:00
Dmitriy Zaporozhets
e29ccece33
Namespace model added. Migration to convert exit project/groups
2012-11-22 21:34:26 +03:00
Dmitriy Zaporozhets
ebcbe0c87b
Add status badge for MR
2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets
f6248c255e
User custom method for services array
2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets
93fdc4ca9d
Reannotated
2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets
9f65c274ef
Fix ci service creation logic
2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets
406a0c809b
GitLabCi Service imtegration
2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
95c23b2f97
Annotated. schema updated
2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets
c3b074acab
Service model and service hook
2012-11-20 11:33:49 +02:00
Riyad Preukschas
578cf89812
Fix specs
2012-11-14 01:20:37 +01:00
Saito
f1ac2a616b
remove encode lib, clean all encoded area.
2012-11-09 01:41:07 +08:00
Dmitriy Zaporozhets
8114d36caf
Merge pull request #1720 from coagulant/wiki_search
...
Wiki search
2012-11-07 03:51:20 -08:00
Dmitriy Zaporozhets
8272e18e57
Project path validation: array of not allowed paths
2012-10-30 13:27:15 +02:00
randx
e4cf99db46
Refactor milestones related functionality. Added seeds for Milestine and MR
2012-10-30 09:22:24 +02:00
randx
f417a265d7
Finalize milestones for Merge Requests
2012-10-29 23:45:11 +02:00
randx
d4e070cfad
Improve styles. Add merge request completness to milestone percentage
2012-10-29 22:40:00 +02:00
randx
ecdf778e80
Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
...
Conflicts:
app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00
Sergio Visinoni
e51c37bdbd
Display Merge Requests <-> Milestone relations
...
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
2012-10-26 16:12:40 +02:00
Sergio Visinoni
a7d0816933
Add Milestone information in Merge Requests
...
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
2012-10-26 16:12:40 +02:00
Riyad Preukschas
8c89beb6f9
Change argument order for satellite actions to always start with the user
2012-10-26 00:26:47 +02:00
Riyad Preukschas
78235edda8
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
2012-10-26 00:19:01 +02:00
Dmitriy Zaporozhets
6d0dcb6614
Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE
2012-10-25 12:16:14 +03:00
Scott Holden
2335d7b9cf
Fix broken Note scopes with lambdas, 4.0 compat
...
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
2012-10-24 21:54:15 -07:00
Dmitriy Zaporozhets
b7a9e41bd2
Handle perfomance issue with team import. Model specs
2012-10-24 14:52:17 +03:00
Dmitriy Zaporozhets
fd0aca1225
Feature implemented
2012-10-24 14:20:53 +03:00
randx
0189ee97ed
Security for online editor. Replace dev_access?, master_access? with can? method usage
2012-10-21 12:12:14 +03:00
Riyad Preukschas
d4e3664067
Fix bug in MergeRequest#mark_as_unmergable
2012-10-20 15:27:34 +02:00
Riyad Preukschas
122769e358
Refactor Gitlab::Merge
...
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
2012-10-20 15:25:48 +02:00
randx
e0c43c46dd
Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard
2012-10-17 22:02:52 +03:00
Ilya Baryshev
e6524a919e
Wiki search
...
Very basic, using LIKE, and no search snippets.
2012-10-16 23:05:11 +04:00
Dmitriy Zaporozhets
e84d90c1e7
Merge pull request #1692 from riyad/saner-note-methods
...
Small Note code cleanup
2012-10-15 10:11:00 -07:00
Riyad Preukschas
b1461de993
Make Note methods saner
2012-10-13 16:23:12 +02:00
Valeriy Sizov
3b5c7b6e9a
minor code style fixing
2012-10-12 20:07:23 +03:00
Robb Kidd
16ceae895e
Separate observing of Note and MergeRequests
...
* Move is_assigned? and is_being_xx? methods to IssueCommonality
This is behavior merge requests have in common with issues. Moved
methods to IssueCommonality role. Put specs directly into
merge_request_spec because setup differs for issues and MRs
specifically in the "closed" factory to use.
* Add MergeRequestObserver. Parallels IssueObserver in almost every way.
Ripe for refactoring.
* Rename MailerObserver to NoteObserver
With merge request observing moved out of MailerObserver, all that
was left was Note logic. Renamed to NoteObserver, added tests and
updated application config for new observer names. Refactored
NoteObserver to use the note's author and not rely on current_user.
* Set current_user for MergeRequestObserver
IssueObserver and MergeRequestObserver are the only observers that
need a reference to the current_user that they cannot look up on
the objects they are observing.
2012-10-10 17:59:25 -04:00