home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +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 d005c44816 Mix wrong comment about signup 2015-01-22 10:38:24 -08:00
Dmitriy Zaporozhets 2b10520b30 Merge pull request #7999 from cirosantilli/append-inplace 
Append in place for strings and arrays [failure unrelated]
 2015-01-21 23:07:15 -08:00
Dmitriy Zaporozhets 0c4bb84910 Merge pull request #7762 from jubianchi/commit-closing-issues 
Allow commit messages to close several issues at once
 2015-01-21 11:49:13 -08:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
jubianchi b21a2d821a Allow commit messages to close several issues at once (thanks @123Haynes 
for his work and help)
 2015-01-20 10:45:48 +01:00
Drew Blessing a3ef61de92 Merge pull request #8040 from drag00n/updatedhint 
Use full path from root of project.
 2015-01-18 22:02:46 -06:00
drag00nanddrag00n b97218db4d Use full path from root of project. 
Remove markdown syntax from config file
 2015-01-18 21:34:35 -05:00
Valery Sizov 20028523b5 Application admin scaffold 2015-01-17 15:40:09 -08:00
Dmitriy Zaporozhets 5e04977582 Fix signup settings 2015-01-16 08:49:07 -08:00
Dmitriy Zaporozhets d4a8471fe9 Merge pull request #7987 from cirosantilli/get-instead-match 
Replace match via get with get on routes
 2015-01-15 14:42:24 -08:00
Jacob Vosmaer 3c5c1a7802 Enable signup by default 2015-01-14 17:42:44 +01:00
Dmitriy Zaporozhets be9f5589ed Merge branch 'oauth_api_doc' into 'master' 
OAuth2 API documentation

https://dev.gitlab.org/gitlab/gitlabhq/issues/1713

See merge request !1388
 2015-01-13 19:56:43 +00:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Jacob Vosmaer 90e4b400ba Merge branch 'git-http-blacklist' into 'master' 
Git HTTP blacklist

See merge request !1328
 2015-01-13 10:02:49 +00:00
Valery Sizov f07b165ab7 OAuth API documentation update 2015-01-12 19:29:06 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets d0a50985ec Create ApplicationSettings if does not exist in runtime 2015-01-08 11:26:16 -08:00
Dmitriy Zaporozhets 8133e44998 Hack for migrating to new settings 2015-01-08 10:30:35 -08:00
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Jacob Vosmaer dec168932e Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist 
Conflicts:
	CHANGELOG
 2015-01-08 10:57:08 +01:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Jacob Vosmaer af56c1dd32 White-list requests from 127.0.0.1 
On some misconfigured GitLab servers, if you look in production.log it looks
like all requests come from 127.0.0.1. To avoid unwanted banning we
white-list 127.0.0.1 with this commit.
 2015-01-06 16:56:56 +01:00
Ciro Santilli 33c9f05c6b Append in place for strings and arrays 2015-01-01 21:12:00 +01:00
Dmitriy Zaporozhets 0991d19c0d Merge branch 'user_ssh_keys_on_admin' into 'master' 
User ssh keys on admin

Show user ssh keys on admin user page.

See merge request !1362
 2014-12-30 12:02:16 +00:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Marin Jankovski 492f3a4779 Add user key actions to admins. 2014-12-29 17:07:23 +01:00
Ciro Santilli 29ed462775 Replace match via get with get on routes 2014-12-29 10:17:23 +01:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Dmitriy Zaporozhets 3a678f758d Merge pull request #7989 from cirosantilli/match-compare-to-get 
Disallow POST to compare as it does not create objects
 2014-12-28 22:15:09 +02:00
Marin Jankovski 92eb3974ac Add option to disable/enable developers push to already protected branches. 2014-12-26 11:39:12 +01:00
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
Jacob Vosmaer c8b2def2be Add more comments explaining how we block IPs 2014-12-18 11:08:11 +01:00
Jacob Vosmaer 4a389e7616 Another comment fix 2014-12-16 12:46:55 +01:00
Jacob Vosmaer 49f4fe8c6e Fix copy-paste error in comment 2014-12-16 12:43:38 +01:00
Jacob Vosmaer 764eaedf81 Improve Redis::Store monkey-patch robustness 2014-12-16 12:38:44 +01:00
Jacob Vosmaer 62ea02740d Block Git HTTP Basic Auth after 10 failed attempts 2014-12-15 18:57:42 +01:00
Christian E. Hopps 0ed4ae7295 Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") 2014-12-15 07:02:07 -05: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