Commit graph

471 commits

Author SHA1 Message Date
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 97a92f8ae7 Fixed user.namespace_id exception if namespace is nil 2012-11-25 12:26:34 +02: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
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
Riyad Preukschas 3b7c2adf0a Add diff format to commit#show 2012-11-22 20:49:44 +01:00
Dmitriy Zaporozhets 71214bee75 Move directory with project. Fixed all related path methods to use namespace 2012-11-22 22:41:26 +03:00
Riyad Preukschas 6ddf4567f4 Don't escape Html in patches
Fixes #2036
2012-11-22 12:45:39 +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 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
Dmitriy Zaporozhets 8114d36caf Merge pull request #1720 from coagulant/wiki_search
Wiki search
2012-11-07 03:51:20 -08:00
Riyad Preukschas be4138af75 Log caught exceptions 2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +02:00
Valeriy Sizov 4f04d7df66 Merge pull request #1915 from tsigo/issue/1912
Fix rendered action for password change failure
2012-11-05 01:29:03 -08:00
Robert Speicher 89d9319a79 Fix rendered action for password change failure
Closes #1912
2012-11-04 16:47:37 -05:00
randx f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
randx f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +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
Riyad Preukschas 700a784bc9 Refactor EditFileAction#update and rename it to commit! 2012-10-26 01:59:50 +02:00
Riyad Preukschas 5f16687805 Update arguments for Gitlab::Satellite::EditFileAction#initialize 2012-10-26 00:39:23 +02:00
Riyad Preukschas 55779b00ea Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction 2012-10-26 00:33:53 +02:00
Dmitriy Zaporozhets fd0aca1225 Feature implemented 2012-10-24 14:20:53 +03:00
randx 83dc5f9362 Fix issue with removing group 2012-10-22 21:21:34 +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
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
Riyad Preukschas 8e8d82d49a Only allow editing text files 2012-10-16 12:45:48 +02:00
Riyad Preukschas ad5a6a4ae1 Improve flash messages in tree#update 2012-10-16 12:45:30 +02:00
randx 809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Valeriy Sizov 42bdfd021b WebEditor: base implementation 2012-10-12 20:07:24 +03:00
Valeriy Sizov 0b3e9fd218 WebEditor: Check if save is possible 2012-10-12 20:07:24 +03:00