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

71 commits

Author SHA1 Message Date
Dmitriy Zaporozhets ef05423f47 Finish select2-ajax for users. Added Select2Helper for tests 2013-03-14 10:16:27 +02:00
Dmitriy Zaporozhets 10f14136f5 fix setting gon.api_token 2013-03-13 23:45:47 +02:00
Dmitriy Zaporozhets bf17d976a7 add api users filter and integrate users select2 2013-03-13 23:19:09 +02:00
Andrew8xx8 0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Andrew8xx8 bca72eac74 Default issue tracker name added to gon variables 2013-02-28 16:11:14 +04:00
Dmitriy Zaporozhets 27d9ac0fe8 Make gitlab works with gitlab-shell 2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets 85de55a120 Dont allow gitlab be loaded in iframe 2013-02-02 20:32:13 +02:00
Dmitriy Zaporozhets 3ddd9f753c Fix mass-assignment. Dont allow users w/o access to create team 2013-01-25 15:42:41 +02:00
Andrey Kumanyaev 18bd1c9d30 update all teams code. refactoring and some corrections 2013-01-24 22:31:25 +02:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets cc0295b789 Only owner can remove project 2012-12-05 06:14:05 +03: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 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
Dmitriy Zaporozhets f37fa968b2 add ability to change namespace from project edit page 2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets c50ec72b52 Deprecate code for Project. Use title and path 2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets 26622f4c8f Improve routing. Project access via namespace 2012-11-22 23:34:06 +03:00
Riyad Preukschas be4138af75 Log caught exceptions 2012-11-06 21:16:47 +01: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
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 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 5a5d214de4 Remove unused render_full_content filter 2012-09-26 16:32:22 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
Cyril 078a8f0e66 factorize before_filters and layout for projects related controllers 2012-09-26 22:27:43 +02:00
Robert Speicher 925183ed7a Add an AdminController base class for Admin controllers 
Handles stuff that's shared across admin controllers.
 2012-09-16 10:06:29 -04:00
randx 367e17cc84 5xx error status code for gitolite & encoding error 2012-09-07 20:47:52 +03:00
Dmitriy Zaporozhets 79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
Robert Speicher 5e1c63d3f0 Move load_refs out of ApplicationController and into CommitsController 
That was the only place it was used.
 2012-09-05 01:13:41 -04:00
Robert Speicher a9f275bc20 Fix load_refs in ApplicationController after default_branch change 
As a last resort it was calling a method that didn't exist. Woops!
 2012-09-05 01:12:44 -04:00
Robert Speicher a463353773 Add "empty_repo?" method to Repository role 
Replaces two calls that this method simplifies
 2012-09-04 12:05:21 -04:00
randx b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
randx 7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
randx 6d92aa6d12 Fix IssueObserver current_user assign. Refactored observers 2012-06-24 10:01:42 +03:00
Dmitriy Zaporozhets 16427f4c40 Merge pull request #880 from NARKOZ/dashboard-feed 
Dashboard feed
 2012-06-01 07:25:54 -07:00
Nihad Abbasov cc3c6ad0ef allow login via private token only for atom feeds 2012-06-01 06:56:28 -07:00
randx 17d4cac208 Rescue encoding error on controller level 2012-05-31 23:36:52 +03:00
randx 3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +03:00
Andrey Vakarev fed1c98047 Refactoring: get rid of ruby antipattern unless/else and use if/else instead 2012-05-20 03:01:13 +03:00
Dmitriy Zaporozhets c9def945d4 User blocking improved. Admin area styled 2012-04-16 23:33:03 +03:00
randx 497ee5fbbc Ability to block user 2012-04-13 08:12:34 +03:00
Dmitriy Zaporozhets 215a01f63c move notes login to one controller 2012-02-24 09:16:06 +02:00
Dmitriy Zaporozhets 81092c0198 Status codes for errors, New error pages 2012-02-23 21:04:20 +02:00
Dmitriy Zaporozhets 7d279f9302 better error handling for not found resource, gitolite error 2012-02-22 07:14:54 +02:00
Dmitriy Zaporozhets 8c40aab120 Abilities extended. Resources security improved 2012-02-22 00:31:18 +02:00
Dmitriy Zaporozhets 29b5aa2c76 Bootstrap: Issues restyled 2012-01-28 01:49:14 +02:00
Valery Sizov 7713f7fefb Notification refactoring 2011-12-17 15:58:35 +02:00
Dmitriy Zaporozhets d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00