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
Dmitriy Zaporozhets 361a8781c9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-14 12:14:07 +02:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06:00
Dmitriy Zaporozhets 71a39655b4 Merge pull request #6258 from zzet/patch-6 
Add emoji images to asset load path.
 2014-02-13 14:59:33 +02:00
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
Andrew Kumanyaev e139cc9e33 Add emoji images to asset load path. 2014-02-06 19:56:47 +03:00
GitLab 319f355aed merge with upstream master 2014-02-06 16:56:20 +05:30
Athos Ribeiro 84408015cd Change Devise.confirm_within to Devise.allow_unconfirmed_access_for 
According to Devise's changelog
(https://github.com/plataformatec/devise/blob/master/CHANGELOG.md),
Devise.confirm_within was deprecated in favor of
Devise.allow_unconfirmed_access_for in version 2.0.0.
 2014-02-03 21:20:36 -05:00
Dmitriy Zaporozhets 5db3468d7e Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecret 
refactor omniauth configuration method
 2014-02-01 05:36:25 -08:00
Dmitriy Zaporozhets c75ab4ec9a Remove python from installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 19:48:47 +02:00
Jacob Vosmaer 4fdafcaf8a Merge pull request #5842 from vikraman/patch-1 
Add comment about tls for ldap method
 2014-01-29 10:24:59 -08:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars 
added group avatars
 2014-01-28 00:26:18 -08:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
dosire c62892b225 People keep adding http:// in front of the host. 2014-01-27 14:27:47 +01:00
Dmitriy Zaporozhets c3ae30b60e Merge branch 'upload-limits' into 'master' 
Upload Limits

Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
 2014-01-27 12:44:14 +00:00
dosire 4fc17cf13f Reword the git explanation. 2014-01-27 13:01:20 +01:00
Dmitriy Zaporozhets 5221dbfee7 Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:57:36 +00:00
Jason Hollingsworth 39a2adf4f4 Fix broken test in spec/models/project_spec.rb 
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
 2014-01-24 21:14:05 -06:00
Jason Hollingsworth 71c157e43b Add files to path blacklist. 
Remove empty ErrorsController
 2014-01-24 20:06:44 -06:00
Raffael Schmid 7863319b97 Merge branch 'master' into dont-depend-on-appid-and-appsecret 
* master: (238 commits)
  Version 6.5.1
  Fix selectbox when submit MR from fork to origin
  Fix HELP layout
  No need for code tag here.
  Spelling mistake and add links.
  Warn against RVM.
  Remove GitHub mention because we also have a GitLab issue tracker now.
  Replace 6.0-to-6.4.md with 6.0-to-6.5.md
  Add public assets to gitignore
  Version 6.5.0
  Use 6-5 branch in installation docs
  Remove deprecated twitter handle.
  Further explain userPrincipalName settings
  Update from 6.4 to 6.5 guide
  Explain how to use AD userPrincipalName for logins
  More entries to CHANGELOG. Version to rc1
  Rephrase LDAP check script output
  add O'Reilly sponsorship in CHANGELOG
  Fix select2 css for drop above style
  Rename "Website url" labels to "Website"
  ...
 2014-01-23 10:55:26 +01:00
dosire 7ad70a56d3 Git over ssh and http are different things. 2014-01-22 17:51:00 +01:00
dosire 119c782e0b More explanation for upload limits. 2014-01-22 17:01:47 +01:00
Dmitriy Zaporozhets d4e82f5e11 Merge pull request #6094 from sinm/patch-1 
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
 2014-01-22 00:19:05 -08:00
Jacob Vosmaer 1ee9442323 Further explain userPrincipalName settings 2014-01-21 13:33:29 +01:00
Jacob Vosmaer 7fe7897c56 Explain how to use AD userPrincipalName for logins 2014-01-21 12:25:12 +01:00
sinm 433fca6c5b Updated gitlab.yaml.example's issue_closing_pattern to single quotes 
… (misused double quotes here)
 2014-01-20 07:47:19 +03:00
Dmitriy Zaporozhets 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02:00
Dmitriy Zaporozhets 4d7792bc38 Merge branch 'explain_ldap_check' into 'master' 
Improve the explanation of the LDAP check script
 2014-01-17 14:14:05 +00:00
Jacob Vosmaer d435fbb9b2 Fix typo in LDAP explanation comment 2014-01-17 11:39:33 +01:00
Jacob Vosmaer 390f0b76b5 Explain allow_username_or_email_login LDAP setting 2014-01-17 11:34:06 +01:00
Jacob Vosmaer af9a14c49c Explain that limit only applies to the check 2014-01-16 18:40:45 +01:00
Dmitriy Zaporozhets 3d743d4567 Merge branch 'custom_password_length' into 'master' 
Document how to customize password length limits
 2014-01-16 10:25:47 +00:00
Jeroen van Baarsen 7d3363954e Always ask for email with github omniauth 
Fixes: #2061

Fix was proposed on twitter by: neic0, in the following tweet:
https://twitter.com/neic0/status/423138339806392320
 2014-01-15 18:52:52 +01:00
Jacob Vosmaer 0db36897e6 Add instructions for custom password length limits 2014-01-13 10:41:10 +01:00
sinm 2b090339d1 It's a bad idea to use hash symbol in a yaml value without quotes 2014-01-12 23:29:29 +03:00
Jeroen van Baarsen c466f4cc44 Fixed the I18n deprecation warning 2014-01-09 13:17:02 +01:00
Jason Hollingsworth 7cc2520541 Add support for various archive formats. 
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
 2014-01-02 10:18:56 -06:00
Raffael Schmid 568d1c27c5 refactor omniauth configuration method 
This refactoring allows a user to use omniauth providers which do not
use ```app_id``` and ```app_secret``` without needing to change the
devise configuration.
 2013-12-30 13:26:35 +01:00
Marin Jankovski c447a2131d Enable secure option if https is used. 2013-12-25 12:30:33 +01:00
Marin Jankovski f537e4c963 Confirmation url throttle. 2013-12-24 10:11:33 +01:00
Dmitriy Zaporozhets 2428a0b2dd Add project_services dir to autoload path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:58:44 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard 
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
 2013-12-16 14:39:14 +01:00
Vikraman Choudhury 969a4a8f71 Add comment about tls for ldap method 
`omniauth-ldap` also supports tls for ldap method
 2013-12-13 22:16:58 +05:30
Jacob Vosmaer 7cb75aeb46 Reduce Fog expiration period to 17 years 2013-12-11 17:40:11 +01:00
Jacob Vosmaer 3e57d88e57 Expire fog links after 34 years 2013-12-11 17:40:11 +01:00
Dmitriy Zaporozhets 445f31c642 Add DELETE to api cors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-11 17:59:37 +02:00
Dmitriy Zaporozhets 5ffce6a65e GitLab app is not threadsafe so better disable allow_concurrency for production env 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 81fc5137ac Fixed the WhiningNill deprecation fix 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets ede272406a Update config/* to rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets ac5842d970 Migrate application to rails 4 step 1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:26 +02:00
Dmitriy Zaporozhets f1c82bc56c Add gitlab-shell#path option in config 
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
  /home/git/gitlab-shell

After this change you can place gitlab-shell in custom location.
Ex:
  /Users/developer/gitlab/gitlab-shell

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 19:32:37 +02:00