home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,369 Commits 48 Branches 340 Tags
43ac196dfb4d445a1ec3f7593194ceacffdffe17
Commit Graph
676 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fd61e3e901 Merge branch 'routing-for-groups' into 'master' 
Routing for groups

Implements http://feedback.gitlab.com/forums/176466-general/suggestions/5723800-group-url-on-root-path-groups-name-instead-of-g
 2014-04-15 10:36:52 +00:00
Dmitriy Zaporozhets 92b5e6b3bf Merge branch 'link-to-oauth-doc' into 'master' 
Link to oauth doc

Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
 2014-04-14 13:19:00 +00:00
GitLab bb7df7663a Add short path route for groups. 2014-04-13 17:46:41 +02:00
Robert Schilling e9409d1f4d Synchronize default issue closing pattern in documetation and implementation, fixes #6742 2014-04-11 23:13:21 +02:00
dosire db1be88f21 Link to the doc. 2014-04-10 14:39:58 +02:00
Drew Blessing 728b05cab7 Add OmniAuth Documentation 
Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Add OmniAuth Documentation

Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Use omniauth again

Remove notice

Restore whitespace

Slight changes
 2014-04-10 07:31:54 -05:00
Marin Jankovski 4df1a10e90 Update development steps. 2014-04-08 11:17:19 +02:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Jacob Vosmaer 5163a8fcb9 Disable connection reaping for MySQL 
On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.
 2014-04-07 12:32:24 +02:00
Dmitriy Zaporozhets 65cd9829ee Remove MergeRequest observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:35:59 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:13:05 +03:00
Dmitriy Zaporozhets 3faa14e7a7 Merge branch 'reduce-observers' into 'master' 
Move issue create/update code to services

Reduce observers role in GitLab code
 2014-04-02 17:54:27 +00:00
Marin Jankovski 1ad79393ad Add print.css to asset precompile array. 2014-04-02 14:42:35 +02:00
Dmitriy Zaporozhets 0d41f6f0a3 Remove issue observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 15:37:57 +03:00
Jacob Vosmaer eeeaaa4bc1 Explain the default repository_downloads_path 2014-03-31 12:19:37 +02:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets ba87b76de1 Use EventCreateService for notes, merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:08:25 +02:00
Jacob Vosmaer 7862201de9 Add source for 'Rendered' message suppression 2014-03-24 09:57:28 +01:00
Jacob Vosmaer b816389182 Suppress 'Rendered' messages in production.log 2014-03-24 09:56:26 +01:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets 41e981740f Use 2 workers in development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Marin Jankovski a740e2d6d1 Do not allow password reset for ldap user. 2014-03-18 12:25:49 +01:00
Dmitriy Zaporozhets b47646ef13 Add retry feature to project import 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 19:26:09 +02:00
Dmitriy Zaporozhets b1ff8e31b1 Add ldap check in application_controller and internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:10:23 +02:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
Dmitriy Zaporozhets b97536a578 Merge branch 'db_reaping_frequency' into 'master' 
DB Reaping Frequency
 2014-03-01 12:55:01 +00:00
Dmitriy Zaporozhets d36669d8ea Merge pull request #6420 from Seklfreak/add-piwik-support 
Added Piwik Integration
 2014-02-26 18:19:25 +02:00
Dmitriy Zaporozhets 6ef3505b19 Add default settings to test env. Removed wrong comment for rack_profiler 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 12:44:29 +02:00
Dmitriy Zaporozhets 93cdf8a312 Enable SQL queries in mini-profiler 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 11:50:02 +02:00
Dmitriy Zaporozhets 645e8d4705 Move services for collecting items to Finders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 19:15:08 +02:00
Jacob Vosmaer 710cffc6d7 Add reaping_frequency for MySQL production DB 
This helped avoid ActiveRecord::ConnectionTimeoutError errors for
Sidekiq on GitLab Cloud.
 2014-02-25 11:07:36 +01:00
Sebastian Winkler 64e4b400d0 Added Piwik support 2014-02-23 15:13:38 +01:00
Pierre de La Morinerie 96dded3ec8 Send emails from the author 
This changes the email "From" field from "gitlab@example.com" to either:

* "John Doe <gitlab@example.com>" if the author of the action is known,
* "GitLab <gitlab@example.com>" otherwise.

Rationale: this allow mails to appear as if they were sent by the
author. It appears in the mailbox more like a real discussion between
the sender and the receiver ("John sent: we should refactor this") and
less like a robot notifying about something.
 2014-02-19 18:25:18 +01:00
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