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

593 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 70690e1971 base implementation 2013-01-22 19:05:01 +02:00
Dmitriy Zaporozhets af7dcda1cb Fix project creation 2013-01-18 22:23:11 +02:00
Dmitriy Zaporozhets 6f05ea4f6e Improve CreateContext call. Fixed test 2013-01-18 20:21:13 +02:00
GitLab 232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Marin Jankovski 296cdd591f Add optional signup. 2013-01-18 11:57:31 +01:00
Riyad Preukschas bda7fe38d0 Merge branch 'master' into discussions 2013-01-15 00:53:00 +01:00
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets f716c0a1dd profjects filter with_push to project model 2013-01-14 09:44:27 +02:00
Dmitriy Zaporozhets 8543313bf5 Few more filters for admin / projects 2013-01-14 09:37:29 +02:00
Dmitriy Zaporozhets 68bfcd0521 Add public filter to admin projects 2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets 122acb2254 fix unauth for public 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
Riyad Preukschas fd836f5490 Update empty error messages and warn if not viewing the most recent wiki page 2013-01-11 21:04:21 +01:00
Riyad Preukschas 167f26b90d Add an ordering scope to Wiki 2013-01-11 20:04:14 +01:00
Alex Denisov 97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00: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
Dmitriy Zaporozhets cc64f2a814 Common filtering for dashboard and group. Share partial search result partial 2013-01-07 20:52:43 +02:00
Dmitriy Zaporozhets baf591cc27 Fix network test and snippets expired 2013-01-05 23:49:01 +02:00
Dmitriy Zaporozhets eded4bfa95 Raise exception and show message to user if repo missing satellite 2013-01-05 23:09:26 +02:00
Dmitriy Zaporozhets e3d7ce2cc4 Tests are fixed now 2013-01-05 12:12:02 +02:00
Dmitriy Zaporozhets ef5b36eaaf Fixed protected branches and file edit 2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Riyad Preukschas 7335f366dc Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
Dmitriy Zaporozhets ccf0686b01 Fix api specs. Use id instead path 2013-01-02 19:46:06 +02:00
Dmitriy Zaporozhets d431e43392 Fix few bugs and tests after refactoring ownership logic 2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets 00a1f5bc2c Project has now correct owner and creator. Increased test coverage 2013-01-02 19:00:00 +02:00
Dmitriy Zaporozhets d075df56d3 Improve perfomance of removeing group 2012-12-30 14:26:19 +02:00
Dmitriy Zaporozhets f45345edb3 Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds 2012-12-30 14:09:43 +02:00
Dmitriy Zaporozhets a16533a04a Add groups to search autocomplete. Use alphabetically scope for users order 2012-12-30 13:50:23 +02:00
Dmitriy Zaporozhets e37a043df7 Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group 2012-12-30 13:37:33 +02:00
Andrey Kumanyaev 98044f0f14 Code duplication removed from controllers 2012-12-26 20:30:11 +04:00
Andrey Kumanyaev 1e3d238910 Replace short loop variable from "p" to "project" 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev 25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev 9c574464a6 Add functional in admin section 2012-12-26 19:52:15 +04: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
Dmitriy Zaporozhets a7b572d0ab Fixed #2333 2012-12-22 11:59:05 +02:00
Dmitriy Zaporozhets a47032bc29 Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509 
Conflicts:
	vendor/assets/javascripts/branch-graph.js
 2012-12-21 13:07:34 +02:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets 2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03: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
Dmitriy Zaporozhets ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Dmitriy Zaporozhets bf13579b92 Make admin sorting more obvious 2012-12-10 06:14:05 +03:00
Koen Punt 4b2ecbc420 Updated branch-graph, abstracted some code in seperate functions 
Removed unused Raphael.fn.popup
 2012-12-07 22:05:17 +01:00
Koen Punt e1282d507f BranchGraph now loads async 
Centralized keyboard and drag events for BranchGraph
 2012-12-07 19:06:46 +01:00
Dmitriy Zaporozhets cc0295b789 Only owner can remove project 2012-12-05 06:14:05 +03:00
Riyad Preukschas c4a7824a8c Fix wall notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas 494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas 06ea122840 Refactor diff notes creation 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 a58385247d Add discussions for merge requests to notes controller 2012-12-03 22:51:55 +01:00
Riyad Preukschas 9b919939a3 Fix parameter passing and wording for per line notes 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets d8398921eb Dont allow select block user as new team member 2012-12-04 15:22:22 +02:00
Dmitriy Zaporozhets ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets 7f6bbf06f8 Fix bug getting started message when navigate to personal projects w/o them exist 2012-12-04 11:18:41 +02:00
Dmitriy Zaporozhets 46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
Dmitriy Zaporozhets c177593e2c Merge pull request #2059 from dolanor/feature-rewording-blocked-users 
Rewording for the account being blocked
 2012-11-30 12:50:06 -08:00
Dmitriy Zaporozhets c38b9a2f80 Filter projects on dashboard 2012-11-30 13:40:34 +02:00
Dmitriy Zaporozhets aaa1c94239 Manage team from groups page. Phase 1 2012-11-29 20:14:05 +03: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
Tanguy Herrmann 70ef433e09 Rewording for the account being blocked 
When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'

They should get the idea this might be only temporary and not because of a technical problem
 2012-11-24 18:21:57 +01:00
Robert Speicher 30a66c065a Improve user feedback on the Profile > Design page 
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
 2012-11-21 15:01:40 -05:00
Martins Polakovs 8c5b79a923 Fixes :notice after project is created 
When projects were created in projects_controller
create.js.haml passed notice as url parameter and
therefore notice was not displayed in the page after
redirect to the project page
 2012-11-21 14:30:35 +02:00
Dmitriy Zaporozhets 898d09a21e Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed 2012-11-21 12:45:15 +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 285743eee1 Merge pull request #2070 from jouve/fix_destroy_project 
fix destroy project from admin
 2012-11-27 01:53:24 -08:00
Cyril b382ce4d91 fix destroy project from admin 2012-11-26 01:22:44 +01:00
Dmitriy Zaporozhets 97a92f8ae7 Fixed user.namespace_id exception if namespace is nil 2012-11-25 12:26:34 +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 0e1635a68a Fixing requests after namespaces. Fixed admin bug with access to project 2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets 9304d049de Fixed some tests and snippet colorize 2012-11-23 22: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 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 26622f4c8f Improve routing. Project access via namespace 2012-11-22 23:34:06 +03:00
Dmitriy Zaporozhets 71214bee75 Move directory with project. Fixed all related path methods to use namespace 2012-11-22 22:41:26 +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
Riyad Preukschas 2b1afa0e62 Remove merge_request#raw and replace it with formats to #show 
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
 2012-11-25 00:05:44 +01:00
Riyad Preukschas 3b7c2adf0a Add diff format to commit#show 2012-11-22 20:49:44 +01:00
Riyad Preukschas 6ddf4567f4 Don't escape Html in patches 
Fixes #2036
 2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets dc9916b474 Merge pull request #1998 from erroric/gitlabhq_issue1669 
fix for issue #1669
 2012-11-20 14:10:45 -08: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 4eef112462 Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner 
Cannot remove user that owns a project.
 2012-11-19 04:12:31 -08:00
Sergey Linnik bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Alexey Loktionov 31bf0cd876 fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance 2012-11-16 22:31:17 +04:00
Marin Jankovski 19e8473eb7 Cannot remove user that owns a project. 
Cannot remove user that owns a project.

Make lines shorter, set alert, use path instead of url.
 2012-11-16 14:47:07 +01:00
randx 1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Saito b664b784f1 linguist and web browser will take care of mimetype and encoding problem. 2012-11-10 01:06:20 +08:00
Saito f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00