home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,225 Commits 48 Branches 340 Tags
792d0db12f12ea47f488687bcec0ffd6a42c2b21
Commit Graph
520 Commits
Author SHA1 Message Date
Sytse Sijbrandij 63009af117 Relative root needs to be changed in three places. 2013-08-19 22:20:32 +02:00
Sytse Sijbrandij 7c55c73d63 Fix confusing situation where install guide told you to install init.d script for puma. 2013-08-19 21:54:12 +02:00
Sytse Sijbrandij 6ec73fc9a6 Configure the relative path only one time. 2013-08-19 21:49:27 +02:00
amouhziandHassan Amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root 
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)
 2013-08-15 21:25:09 +02:00
Robin Gloster 2b904cb34f Fix caching when using remote redis server 2013-08-14 00:02:27 +02:00
Sytse Sijbrandij 994fe9fd31 Fix for Resque forking might cause stuck workers for the threaded Sidekiq. 2013-08-10 16:20:33 +02:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork 
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
 2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets 88c741dde0 Refactor recent branches page 2013-08-05 17:59:58 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
 2013-07-30 13:35:33 +03:00
Dmitriy Zaporozhets a7fab42b9c Public area: Project#show page prototype 2013-07-27 21:23:35 +03:00
Izaak Alpert d04f32866f Default allow username or email login to false 
-If not specified in the gitlab.yml default this setting to false

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
 2013-07-18 09:33:12 -04:00
Izaak Alpert 1a31cb2c37 Update the proc/lamda to be consistent 
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
 2013-07-18 09:33:12 -04:00
Izaak Alpert 089605fe6b Allow the ldap logins with email or username 
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
 2013-07-18 09:33:12 -04:00
Izaak AlpertandIzaak Alpert 3d7194f011 Merge Request on forked projects 
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
 2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets cbe9f56afa Ability to create new branch via UI 2013-07-17 00:09:23 +03:00
Dmitriy Zaporozhets 132caae734 Move repo tags to own controller. add ability to remove tags 2013-07-16 23:12:52 +03:00
Dmitriy Zaporozhets 7a167cf1f7 Move branches list to own controller with pagination. Ability to remove branches from UI 2013-07-16 22:19:07 +03:00
Dmitriy Zaporozhets dc038a7108 Rename Group#people to Group#members 2013-07-12 19:01:39 +03:00
Dmitriy Zaporozhets acb402a1c1 Ability to leave group from profile area 2013-07-12 18:22:03 +03:00
Dmitriy Zaporozhets 967d42e0c8 Fix unicorn init and config 2013-07-08 19:28:59 +03:00
Dmitriy Zaporozhets 66d6c80966 Disable threadsafety 2013-07-08 18:24:02 +03:00
Dmitriy Zaporozhets 6ace422c29 Merge branch 'master' into 6-0-dev 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-08 09:50:10 +03:00
Dmitriy Zaporozhets 6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Dmitriy Zaporozhets 2882d16e7a cleanup puma config a bit 2013-07-08 07:55:16 +03:00
Jacob Vosmaer ae9e4a52c5 Add cluster mode instructions to puma.rb.example 2013-07-04 11:14:03 +02:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev 
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
 2013-07-02 11:47:09 +03:00
Dmitriy Zaporozhets 7588186e81 Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq 2013-07-02 08:43:40 +00:00
Jacob Vosmaer 9e86f3b156 Warn that relative URL's are unsupported 2013-07-02 10:27:51 +02:00
Jack Weeden 6a84d92672 Added update and delete_attachment actions to note controller 2013-07-01 10:47:39 +01:00
Dmitriy Zaporozhets 6e550af150 Show shotcut dialog on ? 2013-06-30 22:10:52 +03:00
Dmitriy Zaporozhets 0f84833c33 Remove capistrano files since its very problematic to deploy gitlab with it 2013-06-30 19:19:06 +03:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev 
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
 2013-06-30 11:35:40 +03:00
Dmitriy Zaporozhets 112e919823 Remove unnecessary namespaced resource 2013-06-26 15:02:28 +03:00
Yves Senn 95353aa6c4 Merge pull request #4419 from jlgeering/master 
whitespaces in gitlab.yml.example
 2013-06-25 22:55:13 -07:00
Jean-Luc Geering 01d694aaba whitespaces in gitlab.yml.example 2013-06-25 14:01:41 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
Dmitriy Zaporozhets 96f3a88c01 Restrict auto generated routes 2013-06-22 15:11:23 +03:00
Dmitriy Zaporozhets ee13297af2 Cleanup: removed unused routing/methods. Improved admin area usability 2013-06-22 14:11:20 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets e12c9ee2bc Added UsersGroup scaffold. Simplify adding people to group 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 5b40780290 Password expire: implement password resource inside profile. add before_fiter check 2013-06-13 19:53:04 +03:00
Dmitriy Zaporozhets 2c3ddacbd7 Disable threadsafe! for rake tasks 2013-06-13 09:58:03 +03:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 5511a731bc Enable threadsafe. Preload lib/ 2013-06-11 18:03:13 +03:00
Dmitriy Zaporozhets 9ae26cd128 Merge pull request #4257 from jojosch/fix/routing-commit-with-# 
Routing fix Commit-List: branch with # and + in name
 2013-06-11 01:03:03 -07:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03:00
Johannes Schleifenbaum c830bab79a Commit List and Tree allow also + in branch name 2013-06-09 23:47:55 +02:00
Johannes Schleifenbaum 37ff9d88ec Routing fix Commit-List: switch to branch with # in name 2013-06-09 16:28:55 +02:00
Daniel Salmerón AmselemandDmitriy Zaporozhets 64c37a21c8 Fix typo in smtp_settings.rb.sample 2013-06-07 16:59:53 +03:00