home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
1143 Commits
Author SHA1 Message Date
Crom (Thibaut CHARLES) 906c65b624 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 
Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
 2013-12-09 13:22:22 +00:00
Dmitriy Zaporozhets 6edb4c0634 Allow Cross-origin resource sharing for GitLab API 
It will allow to write web applications on other domains to interact
with GitLab instances

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 10:29:45 +02:00
Dmitriy Zaporozhets 23d180f5f1 Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq 2013-12-04 14:56:19 +00:00
Jacob Vosmaer 80302a0f6f Limit the number of results in gitlab:ldap:check 2013-12-03 18:51:21 +01:00
Drew Blessing b08608b261 Issue 5716 - Allow removal of avatar 
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
 2013-12-02 16:20:34 -06:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Dmitriy Zaporozhets 931e6a721f Merge branch 'relative-url-needs-warning' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:07:36 +00:00
Marin Jankovski 72e2fe2c8a Change the mysql user to git from gitlab. 2013-11-29 16:46:38 +01:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 14:46:40 +02:00
Sytse Sijbrandij b8cb7df761 Add warning back. 2013-11-29 08:57:45 +01:00
Jacob Vosmaer 47239aabef Refer to rake gitlab:ldap:check script 2013-11-28 18:12:12 +01:00
Sytse Sijbrandij 22d3aa4e32 Unsupported is unclear. 2013-11-28 07:57:56 +01:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 47e8c67d1d Include API session route under rack protection 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 18:24:45 +02:00
Dmitriy Zaporozhets 0461760f21 Minimal password length increased 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 18:11:03 +02:00
Marin Jankovski bb71c5d89f No limits when testing. 2013-11-21 16:04:23 +01:00
Jacob Vosmaer 728f1d812f Merge pull request #5621 from archiloque/typo_in_gitlab.yml 
Typo in gitlab.yml.example
 2013-11-20 01:03:35 -08:00
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature 
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:14:56 +02:00
Julien Kirch a48e9ce999 Typo in gitlab.yml.example 2013-11-19 12:35:48 +01:00
Dmitriy Zaporozhets 0815098d3a Admin can transfer project to any namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-15 15:25:37 +02:00
Jacob Vosmaer fcfbb485d5 Merge pull request #5587 from archiloque/fix_omniauth_link 
Fix link to auth wiki page
 2013-11-13 00:34:57 -08:00
Julien Kirch 963213b842 Fix link to auth wiki 2013-11-12 18:15:26 +01:00
Dmitriy Zaporozhets 13a6604030 Ability to remvoe broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 15:20:31 +02:00
Dmitriy Zaporozhets dd501aa7a7 Broadcast messages scaffold in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:28:12 +02:00
Dmitriy Zaporozhets fa323c0ca1 Merge pull request #5570 from iBotPeaches/master 
Allow closes/closed & fixes/fixed for automatic issue closing
 2013-11-09 01:44:36 -08:00
Connor Tumbleson a360ce73b2 Allow closes/closed & fixes/fixed for automatic regex closing 2013-11-08 07:51:29 -06:00
Marin Jankovski 3c8c06751c Enable rack_attack by default. 2013-11-06 13:10:59 +01:00
Crom (Thibaut CHARLES) 87fc35073a Fixed comments for running gitlab in a non-root path 
- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server)
- If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
 2013-11-06 10:14:48 +00:00
Dmitriy Zaporozhets d78b6ce4cc New feature: Ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 16:41:29 +02:00
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
devaroop b6bd4856a3 getting user keys publically through http without any authentication, the github way. E.g: http://github.com/devaroop.keys 2013-10-02 20:39:29 +05:30
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