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
6,126 Commits 48 Branches 340 Tags
b00ee27ccfe1b8d9828985a6cd87f0786edca89b
Commit Graph
6126 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets b00ee27ccf Merge branch 'focus-of-gitlab-recipes' of /home/git/repositories/gitlab/gitlabhq 2013-08-10 17:30:47 +00:00
Dmitriy Zaporozhets 80ee5ed88d Remove unused files 2013-08-10 20:26:58 +03:00
Dmitriy Zaporozhets 3281021e8b Rewrite issues/mr filtering logic 2013-08-10 20:25:53 +03:00
Sytse Sijbrandij 109af25ed2 Mention gitlab recipes correctly, small updates to update section. 2013-08-10 18:56:15 +02:00
Dmitriy Zaporozhets 5b8cc95d6e Fix checkall issues checkbox position for FF 2013-08-10 19:37:31 +03:00
Dmitriy Zaporozhets f3fa44721d Fix issues update title selectboxes with zero width 2013-08-10 19:30:27 +03:00
Dmitriy Zaporozhets fb36355f2f Different search placeholder depdends on area 2013-08-10 19:12:25 +03:00
Dmitriy Zaporozhets 01be32043a Merge branch 'fix-sidekiq-stuck-workers' of /home/git/repositories/gitlab/gitlabhq 2013-08-10 14:47:08 +00:00
Sytse Sijbrandij 994fe9fd31 Fix for Resque forking might cause stuck workers for the threaded Sidekiq. 2013-08-10 16:20:33 +02:00
Dmitriy Zaporozhets fe059b6c4b Merge pull request #4749 from tdm00/update-install-doc-link-to-master 
Change links from 5-3 branch to point to master instead
 2013-08-10 03:41:16 -07:00
Dmitriy Zaporozhets 692e1b4b10 Merge pull request #4750 from ronaldvaneede/test_service_button 
Fix for #4535 ('Test settings' button for services gives 500 on empty repo)
 2013-08-10 03:40:32 -07:00
Dmitriy Zaporozhets a97fefcdf9 Merge branch 'warn-against-using-master' of /home/git/repositories/gitlab/gitlabhq 2013-08-10 10:20:03 +00:00
Ronald van Eede 62ba789545 Added can_test? mehod to Service model and added tests 2013-08-09 22:02:34 +02:00
Troy Murray d8bd9cfafe Change links to 5-3 branch to point to master instead 2013-08-09 14:08:56 -04:00
Sytse Sijbrandij a6377cb649 Stronger and more specific warning. 2013-08-09 15:37:28 +02:00
Dmitriy Zaporozhets 0a53e47bae Extend CHANGELOG for 6.0 2013-08-09 16:17:52 +03:00
Dmitriy Zaporozhets 59b57eecf5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-09 16:00:04 +03:00
Dmitriy Zaporozhets 9a996460e3 Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq 2013-08-09 12:59:51 +00:00
Dmitriy Zaporozhets 08538da2c0 Merge branch 'update_gitlab_shell_in_5_4_upgrade' of /home/git/repositories/gitlab/gitlabhq 2013-08-09 12:59:10 +00:00
Jacob Vosmaer 6636c161fe Update to gitlab-shell 1.5.0 during 5.3-5.4 update 2013-08-09 14:56:15 +02:00
Sytse Sijbrandij d6d0a1721c Thx Jacob. 2013-08-09 14:46:09 +02:00
Sytse Sijbrandij 3f283904b0 Better wording of diff surpression. 2013-08-09 14:25:22 +02:00
Jacob Vosmaer 4949e2116f Merge pull request #4738 from fnkr/patch-1 
new animated-screenshots
 2013-08-09 04:55:17 -07:00
Florian Kaiser 1499f2dfdf changed the image link to include the commit SHA 2013-08-09 13:31:16 +02:00
Dmitriy Zaporozhets ebf11981e0 Merge branch 'fix/branch-padding' of /home/git/repositories/dzaporozhets/gitlabhq 2013-08-08 20:49:40 +00:00
Dmitriy Zaporozhets 27b3d2302e Remove unecessary paddding at Branches#index page 2013-08-08 20:48:06 +00:00
Dmitriy Zaporozhets b8ee6af05d Merge branch 'master' of /home/git/repositories/dzaporozhets/gitlabhq 2013-08-08 20:45:36 +00:00
Dmitriy Zaporozhets 5c44623bc9 quickfix 2013-08-08 23:38:41 +03:00
Dmitriy Zaporozhets 8e6ffa1ea8 Fix form mr issue with ci 2013-08-08 23:34:36 +03:00
Dmitriy Zaporozhets 3ee46726c5 Remove unecessary paddding at Branches#recent page 2013-08-08 20:25:47 +00:00
Dmitriy Zaporozhets 869f45b36a Fix assign-to-me buttton 2013-08-08 21:26:13 +03:00
Dmitriy Zaporozhets 53cc9df4f1 Mention Merge requests on forks in changelog 2013-08-08 21:14:19 +03:00
Dmitriy Zaporozhets f0e994b6c0 improve MergeRequest edit page 2013-08-08 21:11:28 +03:00
Dmitriy Zaporozhets 2d56d89b92 update devise to 2.2.5 2013-08-08 19:45:03 +03:00
Dmitriy Zaporozhets 76eb9532df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-08 19:00:53 +03:00
Dmitriy Zaporozhets 44e2a2e453 Compact list for commits page 2013-08-08 18:59:46 +03:00
Dmitriy Zaporozhets 66dacfc52a Merge branch 'karlhungus-mr-on-fork' of /home/git/repositories/gitlab/gitlabhq 2013-08-08 15:46:09 +00:00
Dmitriy Zaporozhets 2388ca0f32 Revert notification specs 2013-08-08 17:42:27 +03:00
Dmitriy Zaporozhets 7fefb0397e Fix filter context. Dont duplicate target project name for MR 2013-08-08 17:29:31 +03:00
Jacob Vosmaer da06edb088 Merge pull request #4664 from tdm00/clarify-adding-custom-oauth-provider 
Clarify documentation on how to add custom Omniauth provider to GitLab
 2013-08-08 07:24:49 -07:00
Troy Murray 3b19ef5b26 Clarify documentation on how to add custom Omniauth provider to GitLab 2013-08-08 10:16:52 -04:00
Dmitriy Zaporozhets 02c3bb7a32 fix chosen ui. fixed network tests 2013-08-08 16:14:38 +03:00
Dmitriy Zaporozhets ca52f84841 Update chosen, improve ui, fix MR fork tests 2013-08-08 15:14:59 +03:00
Florian Kaiser 9ad393b2eb new animated-screenshots 
- half size: 1465 KB -> 641KB
- mutch better quality
- no MakeAGIF.com branding
- HTTPS link (via github gist) so there is no github-camo proxy needed (camo makes this image loading 0.55s slower in my short test)
- all source-files are available here: https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7
 2013-08-08 13:51:57 +02:00
Dmitriy Zaporozhets f4978bc08e Fix unmerged diff for non-fork MR 2013-08-08 12:44:33 +03:00
Dmitriy Zaporozhets 3f9b1d62ef reset db schema 2013-08-08 12:30:50 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork 
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
 2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets c7e490ebd5 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 2013-08-08 12:12:46 +03:00
Dmitriy Zaporozhets 1a83fea711 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-08 11:58:44 +03:00
Dmitriy Zaporozhets acc21d30fb Increase input padding. Minor ui fixes 2013-08-08 11:57:34 +03:00