Commit Graph
563 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 10:28:49 +02:00
vollnhalsandLion Vollnhals 67c18aa941 Respect the configured redis URL when initializing the session store
It was not possible to start Gitlab with a redis server running on another host or port. Every other subsystem that uses redis respects the settings in config/resque.yml.

This patch uses the configured url from the cache_store configuration.
The cache_store configuration already loads the correct redis url from config/resque.yml.

Closes #5406
2013-10-30 17:11:56 +01:00
Peter Fern 05c988419f Expand refs constraints to include valid characters
Fixes #4831, #4865, #4932
2013-10-24 16:31:15 +11:00
Edouard 4dbce77615 Fix typo in sample smtp settings 2013-10-22 17:38:11 +02:00
Marin Jankovski 728f0c2005 Add smtp settings override in smtp_settings sample file. 2013-10-18 09:49:55 +02:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
2013-10-15 09:56:04 +03:00
Sytse Sijbrandij ba7c1764be The cookie store is vulnerable to session replay attacks. 2013-10-11 17:54:46 +02:00
Dmitriy Zaporozhets 1935b494f6 Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq 2013-10-10 04:58:17 +00:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Dmitriy Zaporozhets c44c5f5faa Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq 2013-10-02 14:14:49 +00:00
Sytse Sijbrandij c9dd2ca64b Correct spelling mistake. 2013-10-02 08:23:27 +02:00
Jacob Vosmaer a3731cf362 Use peer-based authentication for PostgreSQL 2013-10-02 08:07:36 +02:00
Jacob Vosmaer 485162ec60 Streamline MySQL setup in installation.md 2013-10-02 08:07:36 +02:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Sytse Sijbrandij d66025f768 Also update example. 2013-10-01 11:43:53 +02:00
Sytse Sijbrandij 5c2c5db7b7 Also match if it is at the end or in the middle of a sentence. 2013-10-01 10:53:44 +02:00
Dmitriy Zaporozhets ac6180bcb0 Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq 2013-10-01 08:14:05 +00:00
Dmitriy Zaporozhets 9ffabc6d7e Merge pull request #5200 from pfaro/bugfix-signup
Add check if the signup setting is enabled. fixes #4832
2013-09-30 07:04:40 -07:00
Marin Jankovski 055b60d420 Add documentation to help section, rack_attack as example 2013-09-30 11:10:46 +02:00
Thomas Misilo e99701fbfa Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path 2013-09-29 13:46:02 -04:00
Thomas Misilo b688bac9b6 Updated at the request of @f0k 2013-09-28 07:40:48 -04:00
Thomas Misilo 06903b0396 Added reference to the line "ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"" , as it talked about in the gitlab.yml.example 2013-09-27 08:39:38 -04:00
Perry Faro 96ae1a8099 Add check if the signup setting is enabled. fixes #4832 2013-09-27 11:56:30 +02:00
Marin Jankovski c562d290ea Enable rack attack and add a throttle. 2013-09-25 19:07:14 +02:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
2013-09-24 22:14:28 +03:00
Izaak Alpert fcba0d55f4 Defaulted theme to MARS
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
2013-09-22 01:06:22 -04:00
Izaak Alpert 51e6095dd1 Make users theme configurable
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
2013-09-22 01:05:14 -04:00
Ash Wilson 8bbb5628c4 Don't quote the default issue closing regex.
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
2013-09-15 15:46:32 -04:00
Dmitriy Zaporozhets 9f2e19b064 Merge pull request #5084 from spudstud/patch-2
Update unicorn.rb.example
2013-09-14 08:09:36 -07:00
Spencer 53b75acf79 Update unicorn.rb.example 2013-09-13 19:07:05 -06:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Angus MacArthur f87e2d2801 make public/private setting for project creation configurable 2013-09-09 14:10:58 -04:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
2013-08-27 21:39:34 +03:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets 999c4888fd Merge pull request #4845 from mmoll/unicorn_localhost
bind unicorn listener to 127.0.0.1
2013-08-25 12:21:11 -07:00
Jacob Vosmaer 2b9d48ccd0 Fix the service gitlab restart command
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
  worker processes.
2013-08-23 10:31:32 +02:00
Michael Moll b3e07ec334 bind unicorn listener to 127.0.0.1
otherwise it will listen on 0.0.0.0
2013-08-22 13:17:58 +02:00
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
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
Dmitriy Zaporozhets 20397091f1 Show iid in event feed and uatocomplete as default id for issues, mr 2013-08-19 22:12:59 +03: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