Dmitriy Zaporozhets
|
cc36f6dcf8
|
Few fixes after pull from gitlab upstream
|
2013-08-12 14:20:08 +03:00 |
|
Dmitriy Zaporozhets
|
9ff730254a
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
db/schema.rb
|
2013-08-12 13:47:02 +03:00 |
|
Dmitriy Zaporozhets
|
2a42030a8c
|
Version to 6.0.0-ee.beta
|
2013-08-12 13:37:17 +03:00 |
|
Dmitriy Zaporozhets
|
541e70d8f8
|
Replace license to MIT in EE files
|
2013-08-12 13:35:52 +03:00 |
|
Dmitriy Zaporozhets
|
f2bfda9bd2
|
LiCENSE to MIT
|
2013-08-12 13:33:01 +03:00 |
|
Dmitriy Zaporozhets
|
7984d3ca00
|
Minor UI fixes for login page
|
2013-08-12 12:38:30 +03:00 |
|
Dmitriy Zaporozhets
|
083990c795
|
Minor UI improvements
|
2013-08-12 12:08:52 +03:00 |
|
Dmitriy Zaporozhets
|
0175e66589
|
hide no-ssh message if notice or alert present
|
2013-08-10 21:20:03 +03:00 |
|
Dmitriy Zaporozhets
|
37cf2eb691
|
More readable notice/alert messages
|
2013-08-10 21:10:24 +03:00 |
|
Dmitriy Zaporozhets
|
11ecf00781
|
Remove unnecessary margin for issue/mr title
|
2013-08-10 20:54:17 +03:00 |
|
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
|
f8475f73cc
|
do ldap access check only if current_user defined
|
2013-08-10 18:15:51 +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 |
|
Dmitriy Zaporozhets
|
99efbc8cee
|
Do ldap permissions update every hour
|
2013-08-09 15:54:58 +03: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 |
|
Dmitriy Zaporozhets
|
cd78651906
|
Fixed group tests
|
2013-08-09 15:01:32 +03: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
|
915315a460
|
ldap_access field added to group. set ldap group membership based on ldap_access value
|
2013-08-09 12:53:52 +03: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 |
|