home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,145 Commits 48 Branches 340 Tags
ce6b0519ccddff2476d2255df49b39ccdb07013e
Commit Graph
855 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
 2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets 592e396869 Rework oauth2 feature 
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:35:04 +02:00
Dmitriy Zaporozhets 63be16008e Hide rack profiler by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 15:43:45 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/group.html.haml
 2014-12-21 01:20:51 +02:00
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 01:11:08 +02:00
Dmitriy Zaporozhets 6a5766e370 Merge pull request #7978 from cirosantilli/edit-preview-route-test 
Add tests for tree edit routes
 2014-12-20 20:17:25 +02:00
Dmitriy Zaporozhets 65b858a776 Merge branch 'show_files_with_diff_name' into 'master' 
Show files named diff

Fixes #1749

See merge request !1318
 2014-12-11 14:07:12 +00:00
Dmitriy Zaporozhets cf3d581004 Merge pull request #8052 from mr-vinn/markdown-preview 
Enable Markdown preview for issues, merge requests, milestones, and notes
 2014-12-11 13:23:33 +02:00
Marin Jankovski 1d0dfd50cc Do not check for format on blob diff path. 2014-12-10 15:54:01 +01:00
Sytse Sijbrandij acf1844897 Merge branch 'unicorn-advice' into 'master' 
Unicorn advice

See merge request !1314
 2014-12-08 13:30:20 +00:00
Job van der Voort f811b695f8 memory constrained unicorn workers 2014-12-08 14:21:17 +01:00
Job van der Voort b7d4184f24 advise about unicorn workers 2014-12-08 13:51:27 +01:00
Jacob Vosmaer b8dfd63eac Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable 2014-12-08 13:39:25 +01:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets a46fe875c6 Feature: atom feed for user activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 21:49:19 +02:00
Jacob Vosmaer 6491974554 Disable Sidekiq arguments logging by default 2014-12-01 18:58:37 +01:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:50:25 +02:00
Jacob Vosmaer 64ab6c9ed5 Add 'MemoryKiller' Sidekiq middleware 
When enabled, this middleware allows Sidekiq to detect that its RSS has
exceeded a maximum value, triggering a graceful shutdown. This
middleware should be combined with external process supervision that
will restart Sidekiq after the graceful shutdown, such as Runit.
 2014-11-28 15:01:41 +01:00
Robert Djurasaj bc16f81321 Update time zone rake task for production. Resolves #8387 2014-11-25 11:18:56 -07:00
Dmitriy Zaporozhets 8e7fa0c2a1 Use new gitlab-shell v2.3.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 17:15:51 +02:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Dmitriy Zaporozhets cfee95d032 Merge pull request #8340 from cirosantilli/multi-ruby-install-v2 
Web edit and HTTPS push work if multiple Rubies installed v2
 2014-11-18 15:00:56 +02:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project 
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-13 22:06:19 +02:00
Crom (Thibaut CHARLES) 3c9bf8a322 Doc: Unicorn minimum worker_processes is 2 
A value of 1 cause http push fail (issue #6978 on GitHub)
 2014-10-30 23:41:45 +01:00
Dmitriy Zaporozhets 59c25eb215 Merge pull request #8122 from bbodenmiller/cleanup-time-zone 
cleanup time zone settings
 2014-10-30 16:46:36 +02:00
Marin Jankovski d78e80fa74 Add email interceptor to prevent mail sending if email sending is disabled. 2014-10-27 13:05:50 +01:00
Marin Jankovski d504ca8a0c Add settings to disable email sending from GitLab. 2014-10-27 13:02:12 +01:00
Dmitriy Zaporozhets 3220e191ae Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-path 
Remove unneeded app/finders config.autoload path
 2014-10-22 16:56:07 +03:00
Ben Bodenmiller 3dbe0810f5 cleanup time zone settings 
time zone settings moved to gitlab.yml in https://github.com/gitlabhq/gitlabhq/pull/8015
 2014-10-21 13:36:09 -07:00
Sullivan SENECHAL 593a287c8d Add timezone configuration to gitlab.yml 2014-10-21 11:27:16 +02:00
Dmitriy Zaporozhets ab2db486b8 Merge branch 'security-api-internal-publicity' into 'master' 
Gitlab-shell identification

Part of gitlab/gitlabhq#1528

See merge request !1185
 2014-10-20 10:47:43 +00:00
Jan-Willem van der Meer 61d9d4e2eb Default the LDAP server label to LDAP 2014-10-17 18:08:26 +02:00
Jan-Willem van der Meer d1c3864778 Prevent redeclaration of LDAP strategy 2014-10-17 18:03:34 +02:00
Vinnie Okada cd3eabd712 Use GET instead of POST for Markdown previews 2014-10-16 22:45:13 -05:00
Vinnie Okada 5700842ba8 Add Markdown preview to more forms 
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
 2014-10-15 23:52:33 -05:00
Valery Sizov b5763e91cd add gitlab-shell identification 2014-10-15 20:03:25 +03:00
Jan-Willem van der Meer dcf6c26075 Only enable LDAP providers if LDAP is enabled 2014-10-15 09:53:16 +02:00
Dmitriy Zaporozhets e3bd17a7ba Merge branch 'feature-multiple-ldap-servers' into 'master' 
Feature multiple ldap servers

Update the code so Gitlab-EE can support multiple LDAP servers

See merge request !1172
 2014-10-14 15:01:37 +00:00
Jan-Willem van der Meer b4f7b387d0 Explain new configuration options. 
And add some advertisement to use GitLab EE
 2014-10-14 15:03:53 +02:00
Jan-Willem van der Meer fedb223b09 Add valid LDAP server for testing 2014-10-14 13:52:15 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Marin Jankovski 1d432e96bc Add a link to libravatar doc in gitlab.yml.example. 2014-10-14 12:31:47 +02:00
Jan-Willem van der Meer fc5bfd1dc1 Move dynamic omniauth declarations to initializer 2014-10-14 09:31:06 +02:00
Jan-Willem van der Meer e1cf9c15eb Apply configuration changes for Multiple LDAP servers 2014-10-13 14:04:10 +02:00
Jan-Willem van der Meer 3cd5abf635 Add config changes for mutliple LDAP support (EE only) 2014-10-13 13:56:54 +02:00
Ciro Santilli 10783f4d7b Remove unneeded app/finders config.autoload path 
Every directory under app/ is searched by default
 2014-10-07 23:41:02 +02:00
Marin Jankovski 70776c71b0 Merge branch 'remove-annoying-i18n-deprecation' into 'master' 
Remove annoying i18n deprecation

Thanks to this guy http://stackoverflow.com/a/20381730

Fixes #527

See merge request !197
 2014-10-07 09:19:43 +00:00
Ciro Santilli f4efb19038 Add tests for tree edit routes 
Critical because of possible confusion between /:id/preview
and /:id for a path that ends in preview.
 2014-10-07 10:04:09 +02:00