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

431 commits

Author SHA1 Message Date
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
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
Valeriy Sizov e53b47b447 WebEditor: sceleton 2012-10-12 20:07:24 +03:00
Valeriy Sizov f6a8e69449 WebEditor: base form 2012-10-12 20:07:23 +03:00
Dmitriy Zaporozhets baf94bd732 Merge pull request #1675 from robbkidd/separate_mr_observer 
Separate observing of Note and MergeRequests
 2012-10-11 09:35:21 -07: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
Robert Speicher ace816354f Add toggle to show closed issues on Milestones#show 
Progress on #1167
 2012-10-10 12:43:59 -04:00
Riyad Preukschas 3f72af9994 Make notes for merge requests include commit notes and add helpers 2012-10-10 12:06:30 +02:00
Robert Speicher 702133c0e2 Remove unused history_path instance variable 2012-10-09 18:39:03 -04:00
randx 679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
randx 63fe042d97 project.issues_labels method 2012-10-09 20:39:06 +03:00
randx c348284fed Reduce count of projects on dashboard to 20 2012-10-09 10:01:07 +03:00
randx ce1b742b1e Group: new link on dashboard if admin. Fixed people count 2012-10-09 09:46:20 +03:00
Valeriy Sizov a635b9da97 Revert "Do not allow removal of a project owner user." 
This reverts commit 927d0cc267.
 2012-10-08 15:57:30 +03:00
Valeriy Sizov fc3c0592db Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner 
Do not allow removal of a project owner user.
 2012-10-08 05:42:47 -07:00
Marin Jankovski 927d0cc267 Do not allow removal of a project owner user. 2012-10-08 12:41:25 +02:00
Dmitriy Zaporozhets d88332709c Fixed group issues/mr. Also speedup project list of admin area 2012-10-04 10:51:35 +03:00
Dmitriy Zaporozhets c8412bc9ed Dont change params hash. Use dup instead 2012-10-03 15:02:02 +03:00
Dmitriy Zaporozhets ce1b79afa9 SQL Fixes 2012-10-03 14:26:37 +03:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
randx 1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets f9eda9b33a Group filtering on dashboard 2012-10-02 19:37:53 +03:00
Dmitriy Zaporozhets d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Cyril be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
Cyril 933c5e4146 update new controllers 2012-09-27 13:44:53 +02:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
 2012-09-27 12:25:52 +02:00
Robert Speicher afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher f8c02f6e39 Add branches and tags Repo methods 
Simplifies the actions in RepositoriesController
 2012-09-26 16:32:26 -04:00
Robert Speicher e9bd45060e Fix logs not showing in Tree for the root path 2012-09-26 16:32:25 -04:00
Robert Speicher b6d6663e0e Fix the remaining actions in RefsController 2012-09-26 16:32:25 -04:00
Robert Speicher 6cb626ef51 Add Compare#index and Compare#create actions 
Create just redirects to our specially-formatted #show action
 2012-09-26 16:32:24 -04:00
Robert Speicher 95f0a41141 Fix Refs#switch 2012-09-26 16:32:23 -04:00
Robert Speicher 33126227af Remove check_token_auth filter 
Because of the way ExtractPaths works, `params[:format]` wouldn't
necessarily be available at the time this filter was running, and so it
would erroneously redirect to `new_user_session_path`
 2012-09-26 16:32:23 -04:00
Robert Speicher 1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher 99d391332f Add a "patch" MIME type, and render it like a normal view in Commit#show 2012-09-26 16:32:23 -04:00
Robert Speicher 3574826920 Use Commits#show instead of Commits#index 
Takes tree-ish + path as ID
 2012-09-26 16:32:22 -04:00
Robert Speicher 169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher 5a5d214de4 Remove unused render_full_content filter 2012-09-26 16:32:22 -04:00
Robert Speicher a1e68a9120 Rename RefExtractor to ExtractsPath 
Update docs a bit
 2012-09-26 16:32:22 -04:00
Robert Speicher a8ea8d98a4 Update RefExtractor to handle atom feeds 2012-09-26 16:32:22 -04:00
Robert Speicher 398ba6f1bb DRY up Blame, Blob and Tree controllers 2012-09-26 16:32:22 -04:00
Robert Speicher 576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00