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

388 commits

Author SHA1 Message Date
Riyad Preukschas
47e510e14f Small fixes 2013-01-19 15:26:55 +01:00
Riyad Preukschas
8a5b770c36 Reorder help routes 2013-01-19 15:26:23 +01:00
Riyad Preukschas
8db80f1f6d Rename help#public_area to help#public_access 2013-01-19 15:24:51 +01:00
Marin Jankovski
296cdd591f Add optional signup. 2013-01-18 11:57:31 +01:00
Cyril
9db7c16a1e Fix default settings when they are boolean. 
error is that ```enabled ||= true``` always evaluates to true.
Change all initialization of bool settings to use the same syntax:
```setting = true if setting.nil?```
 2013-01-18 00:00:02 +01:00
Riyad Preukschas
9f1e9f11f1 Merge pull request #2346 from sodabrew/omniauth_configs 
Allow the OmniAuth provider args parameter to be passed through
 2013-01-16 15:58:53 -08:00
Riyad Preukschas
76329a46a3 Fix settings 2013-01-16 23:54:48 +01:00
Riyad Preukschas
eea43c9412 Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group 2013-01-16 23:20:47 +01:00
Riyad Preukschas
0dd8a26a3a Fix satellite path settings 2013-01-16 17:00:38 +01:00
Cyril
31e338b8fd add default for Settings['satellites'] 2013-01-16 16:11:40 +01:00
Dmitriy Zaporozhets
c9e6818ab6 Store repo satellites outside of tmp directory 2013-01-16 13:30:31 +02:00
VonC
471b5910a6 Fix git group detection for gitolite ssh user. 
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.

That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).

M config/gitlab.yml.example:
  Add 'group' in 'git' section
  Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
  Check that gitolite.ssh_user *group* is the one defined in git.group.
  Make sure to default to 'git' as the expected group
    if said group is undefined in the config.
  Note: uses a more complete regexp for the group detection
        (the group can start, end or be in the middle or the list of groups
         of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
  Add default values for gitolite.group and gitlab.user
 2013-01-14 11:44:27 +00:00
Dmitriy Zaporozhets
68bfcd0521 Add public filter to admin projects 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
James Newton
2b38c8a156 remove passenger_fix.rb, which due to the recent removal of Resque in favor of sidekiq breaks gitlab in passenger 2013-01-09 22:17:03 -06:00
Dmitriy Zaporozhets
9773ccc451 sidekiq with green tests 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets
71bd956866 email via sidekiq. start and stop rake tasks 2013-01-09 08:44:05 +03: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
Riyad Preukschas
b5f116f08b Add a check whether repos_path is a symlink 2013-01-07 21:20:20 +01:00
Dmitriy Zaporozhets
e65731bb7e Add concerns to autoload 2013-01-03 09:12:24 +02:00
Johannes Schleifenbaum
ff976bc86c fix grack accessing files beginning with .git 2012-12-31 23:33:00 +01:00
Chris Frohoff
21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets
3de4271846 Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298 2012-12-28 09:14:28 +02:00
Andrey Kumanyaev
c8bf5905bf Fix form url and routes path 2012-12-26 20:31:18 +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
Jakub Jirutka
a1434ff50b Fix shared Redis connection issue on Passenger 2012-12-25 23:14:00 +01:00
Dmitriy Zaporozhets
4c800342af Fix routing by priority 2012-12-25 16:24:44 +02:00
Dmitriy Zaporozhets
3c1022f9b1 No resque errors 2012-12-25 16:18:22 +02:00
Dmitriy Zaporozhets
64db738f9d Trying to fix resque issue 2012-12-25 15:53:50 +02:00
Dmitriy Zaporozhets
c8ba5c2d58 Fix routing issues when navigating over tree, commits etc 2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
49e73f8ac1 Fixed syntax error in config -> settings 2012-12-24 21:29:53 +02:00
Dmitriy Zaporozhets
0dbb369ace Cleanup deprecated configs 2012-12-24 21:25:33 +02:00
Aaron Stone
aec1a84042 Allow the OmniAuth provider args parameter to pass through as either an Array or a Hash. 2012-12-23 16:12:53 -08:00
Dmitriy Zaporozhets
0af5884bcd gitlab.yml how to use section 2012-12-23 00:49:46 +02:00
Dmitriy Zaporozhets
d188adfd97 Changelog updated. Added warnings to username form 2012-12-20 21:16:42 +02:00
Riyad Preukschas
757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Riyad Preukschas
b2e46f44ce Refactor Settings initializer 
All overrides are marked as deprecated.
Default settings are at the bottom.
 2012-12-20 16:54:28 +01:00
Riyad Preukschas
4496903950 Rename config options 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
9ada678819 Split commit_id and noteable_id for Note 2012-12-18 20:02:00 +02:00
Dmitriy Zaporozhets
ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Dmitriy Zaporozhets
dfc5adfc23 Merge pull request #2188 from riyad/update-installation-docs 
Update installation docs
 2012-12-07 12:43:25 -08:00
Sergey Linnik
0aa7f79ca4 allow customize gravatar url 2012-12-07 00:44:22 +04:00
Riyad Preukschas
d1e31bfce9 Remove generic database.yml.example 2012-12-05 17:38:54 +01:00
skarphet
107a4e386a Devise locale updated to stay consistent with GitLab 2012-12-04 19:19:26 +01:00
Johannes Schleifenbaum
fddc0c29aa add help page for gitlab specific rake tasks 2012-12-03 17:19:33 +01: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
Riyad Preukschas
0fbd9ac748 Remove SQLite support 2012-11-27 21:36:09 +01: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
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
8b4010397c Register diff mime type 2012-11-22 20:22:44 +01:00
Alexander Simonov
18bc873d53 Resque must be running in the own namespace 2012-11-20 18:59:37 +02:00
Alexander Simonov
10d8b77b50 Clean old rails2 style code 2012-11-20 18:59:28 +02:00
Dmitriy Zaporozhets
406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Riyad Preukschas
20189f84ee Update gems 2012-11-18 21:51:53 +01:00
Riyad Preukschas
527d223680 Update Rails config 2012-11-18 21:51:53 +01:00
randx
1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Saito
f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00
Valeriy Sizov
0d4568db78 gitolite custom config 2012-11-07 00:47:33 +02:00
Robert Speicher
f61ca97648 Add quiet_assets gem, remove initializer 2012-11-01 16:45:31 -04:00
Markus Grobelin
bd50a9f466 grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git 2012-10-26 14:05:57 +02:00
Dmitriy Zaporozhets
fd0aca1225 Feature implemented 2012-10-24 14:20:53 +03:00
Marin Jankovski
d75cc7eafd Display https as repo clone indicator and prevent modification of web_protocol variable. 
Rewrite build_url, use web_protocol for repo indicator.

Explicitly initialize custom port to make the logic obvious.
 2012-10-21 15:48:34 +02:00
Dmitriy Zaporozhets
2ff36e74eb Merge pull request #1564 from dosire/cookie_secure_setting 
Secure and httponly options on cookie.
 2012-10-21 06:14:36 -07:00
randx
bd5dbe14e4 Merge branch 'web_editor' 2012-10-15 19:52:10 +03:00
Saito
8880c06d3b disable annoying rails assets log messages 2012-10-14 00:02:01 +08:00
Valeriy Sizov
f6a8e69449 WebEditor: base form 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
Andrey Kumanyaev
75e6eb59ec patch rails to ignore text limit 2012-10-10 13:17:48 +04:00
Andrey Kumanyaev
3e1d52f4b7 add default postgres config 2012-10-10 03:58:34 +04:00
Nihad Abbasov
d2ea858fbf move emoji module to lib 2012-10-05 07:42:23 -07:00
Nihad Abbasov
72395d7f6e no need to add fonts to assets path 2012-10-05 07:23:58 -07:00
Nihad Abbasov
317c928198 improve emoji checking performance 2012-10-05 07:23:58 -07:00
Nihad Abbasov
9e4f3147a0 specify HTTP verbs for match in routes 2012-10-05 07:23:57 -07:00
Dmitriy Zaporozhets
f963d37408 Merge pull request #1592 from jouve/devise_layout 
make devise controllers use devise layout
 2012-10-03 07:06:08 -07: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
d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Cyril
236fd1e63b all devise controller use devise layout 2012-09-29 13:06:53 +02:00
Dmitriy Zaporozhets
68f4b59738 Merge pull request #1569 from jouve/simplify_controllers2 
Simplify controllers and layout handling
 2012-09-27 12:53:01 -07: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
Nihad Abbasov
a030e4b664 cleanup database.yml files 2012-09-27 02:56:20 -07:00
Robert Speicher
8432c9c176 Routes are now final 2012-09-26 16:45:00 -04:00
Robert Speicher
afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -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
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
c058e3903e Finalize new routes 2012-09-26 16:32:23 -04:00
Robert Speicher
9d394250a8 Add an inflector to mark "commits" as uncountable 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
576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher
39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher
884eb73297 Enable tree resource, remove old tree routes 2012-09-26 16:32:21 -04:00
Robert Speicher
a21abce94f Add tree-ish route placeholders, modify commit(s) routes 2012-09-26 16:32:20 -04:00