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
|
541e70d8f8
|
Replace license to MIT in EE files
|
2013-08-12 13:35:52 +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
|
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 |
|
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 |
|
Ronald van Eede
|
62ba789545
|
Added can_test? mehod to Service model and added tests
|
2013-08-09 22:02:34 +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
|
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
|
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
|
f0e994b6c0
|
improve MergeRequest edit page
|
2013-08-08 21:11:28 +03:00 |
|
Dmitriy Zaporozhets
|
44e2a2e453
|
Compact list for commits page
|
2013-08-08 18:59:46 +03:00 |
|
Dmitriy Zaporozhets
|
7fefb0397e
|
Fix filter context. Dont duplicate target project name for MR
|
2013-08-08 17:29:31 +03: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 |
|
Dmitriy Zaporozhets
|
f4978bc08e
|
Fix unmerged diff for non-fork MR
|
2013-08-08 12:44:33 +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
|
acc21d30fb
|
Increase input padding. Minor ui fixes
|
2013-08-08 11:57:34 +03:00 |
|
Dmitriy Zaporozhets
|
f79b210061
|
Fix wiki popup for new page
|
2013-08-08 11:40:42 +03:00 |
|
Dmitriy Zaporozhets
|
2e0a373415
|
Merge branch 'improve/proper_form_classes' of /home/git/repositories/gitlab/gitlabhq
|
2013-08-07 20:55:39 +00:00 |
|
Dmitriy Zaporozhets
|
89d0d75c52
|
Better filter var for MR. show reset filter only if makes sense
|
2013-08-07 23:54:26 +03:00 |
|
Dmitriy Zaporozhets
|
b2152847b1
|
Replace xlarge and xxlarge classes
|
2013-08-07 23:40:29 +03:00 |
|
Dmitriy Zaporozhets
|
846e59505e
|
Replace .actions with .form-actions
|
2013-08-07 23:35:24 +03:00 |
|
Dmitriy Zaporozhets
|
e3f9bd231b
|
use control-group classes for inline forms in rest pages
|
2013-08-07 23:32:20 +03:00 |
|
Dmitriy Zaporozhets
|
df437f419b
|
use control-group classes for inline forms in project area pages
|
2013-08-07 23:30:40 +03:00 |
|
Dmitriy Zaporozhets
|
c52f9e1a32
|
use control-group classes for inline forms in project new/edit pages
|
2013-08-07 23:28:02 +03:00 |
|
Dmitriy Zaporozhets
|
a3b0dc2e17
|
use control-group classes for inline forms in profile and group pages
|
2013-08-07 23:24:34 +03:00 |
|
Dmitriy Zaporozhets
|
f2082edb60
|
use control-group classes for inline forms in issues/mr
|
2013-08-07 23:22:46 +03:00 |
|
Dmitriy Zaporozhets
|
49fa9907ae
|
use control-group classes for inline forms in admin area
|
2013-08-07 23:20:10 +03:00 |
|
Dmitriy Zaporozhets
|
a43a380394
|
Increase amount of search results for issues, mr, projects
|
2013-08-07 22:51:36 +03:00 |
|
Dmitriy Zaporozhets
|
27b7aeddfb
|
More compact lists for dashboard issues, mr
|
2013-08-06 21:22:41 +03:00 |
|
Dmitriy Zaporozhets
|
512cd02335
|
Dashboard/Group issues and mr pages refactoring
|
2013-08-06 21:12:01 +03:00 |
|
Dmitriy Zaporozhets
|
21c70354f6
|
Restyle group members page a bit
|
2013-08-06 20:12:20 +03:00 |
|
Dmitriy Zaporozhets
|
65eddc00ad
|
toggle content instead of disabling button for group members editing
|
2013-08-06 18:49:37 +03:00 |
|
Dmitriy Zaporozhets
|
6eabf90b80
|
Ability to edit group member permissions
|
2013-08-06 18:45:45 +03:00 |
|