Valery Sizov
|
43dcc9575a
|
Task #735 Automerge should not be checked on every load of MR show page
|
2012-04-27 00:53:55 +03:00 |
|
Dmitriy Zaporozhets
|
08994f3f60
|
Merge remote-tracking branch 'origin/merge_button'
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
|
2012-04-21 12:22:56 +03:00 |
|
|
Dmitriy Zaporozhets
|
5ef3b38429
|
MR commits suppressed if too many. few icons
|
2012-04-17 22:08:07 +03:00 |
|
|
Valery Sizov
|
a8e4f3ed88
|
Auto-merge: 'already can not be merged' alert
|
2012-04-16 23:05:08 +03:00 |
|
|
Valery Sizov
|
8269a3a735
|
Auto-merge: checking via AJAX
|
2012-04-16 22:08:03 +03:00 |
|
|
Dmitriy Zaporozhets
|
740e54c3fc
|
Merge pull request #667 from keikubo/master
The indents errors of pre blocks in haml
|
2012-04-11 13:34:15 -07:00 |
|
|
Dmitriy Zaporozhets
|
e7add858cf
|
bug fixes & bootstrap buttons
|
2012-04-11 23:32:45 +03:00 |
|
Kei Kubo
|
700eec6672
|
added = preserve to some pre statements
|
2012-04-11 19:13:38 +00:00 |
|
|
Dmitriy Zaporozhets
|
ba3c359fd5
|
b2 fixes
|
2012-04-10 21:39:04 +03:00 |
|
|
randx
|
627efddf63
|
migrated to bootstrap 2
|
2012-04-10 08:51:08 +03:00 |
|
|
Dmitriy Zaporozhets
|
90748cf724
|
Merge Button v1 complete
|
2012-03-30 20:49:34 +03:00 |
|
|
randx
|
3824f9b372
|
Unverify MR on every push. Ajax for MR accept. better UI
|
2012-03-30 08:15:04 +03:00 |
|
|
randx
|
411d84f385
|
Better merge handling. show if MR can be accepted or not
|
2012-03-30 08:05:04 +03:00 |
|
|
Dmitriy Zaporozhets
|
cd74f9da91
|
Link for auto merge, db field for MR
|
2012-03-30 00:27:42 +03:00 |
|
|
randx
|
69ef81404c
|
UI improved, .main_box css class for show pages
|
2012-03-28 10:46:51 +03:00 |
|
|
Dmitriy Zaporozhets
|
46906ca9db
|
Issues, Merge Request show page polished. Fixed +n overflow
|
2012-03-28 00:31:14 +03:00 |
|
|
Dmitriy Zaporozhets
|
7d56a51bdc
|
Js refactoring and ajax animation replaced
|
2012-03-26 21:41:58 +03:00 |
|
|
Dmitriy Zaporozhets
|
39ea486e1f
|
Fixed specs. Some css fixes
|
2012-03-25 19:44:29 +03:00 |
|
|
Dmitriy Zaporozhets
|
8652cd8989
|
Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.
|
2012-03-25 19:05:24 +03:00 |
|
|
Dmitriy Zaporozhets
|
fa8219e0a7
|
better MR list, dashboard pollished
|
2012-03-22 22:57:04 +02:00 |
|
|
randx
|
52d8ed9e4f
|
Pagination for Merge Requests. Fixed for issues
|
2012-03-22 00:09:57 +02:00 |
|
|
Valery Sizov
|
8bb4c6de56
|
improve how to merge tips
|
2012-03-21 23:59:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
341b4414ea
|
styled title block for mr, issue, commit
|
2012-03-16 21:11:03 +03:00 |
|
|
Dmitriy Zaporozhets
|
2ec12c9bb8
|
Impoved merge requests show page. Minor style improvements across project
|
2012-03-16 01:45:46 +02:00 |
|
|
Dmitriy Zaporozhets
|
7b75f3cfd3
|
show who merged request
|
2012-03-15 23:32:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
2e2e0522d4
|
Merge branch 'master' of github.com:gitlabhq/gitlabhq
|
2012-03-15 19:39:28 +02:00 |
|
Ariejan de Vroom
|
cbc56a96ac
|
Updated upvotes view for issue and merge request show
|
2012-03-15 13:03:56 +02:00 |
|
|
Dmitriy Zaporozhets
|
5a3f23f395
|
Persist Merge Request diff. Auto merge request close on push
|
2012-03-15 00:57:43 +02:00 |
|
|
Ariejan de Vroom
|
27e3699814
|
Links +upvote buttons directly to the notes section
|
2012-03-15 00:56:42 +02:00 |
|
|
Ariejan de Vroom
|
2d00f2dfe4
|
Added 'x notes' and +1 counters to issues and merge requests. Refs #549
|
2012-03-15 00:51:03 +02:00 |
|
|
Dmitriy Zaporozhets
|
3676838dc9
|
Rspec test repo replaced.\nMerge Requests improved
|
2012-03-13 23:54:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
a10ad7183e
|
Usability improved. Nothing to show messages for issues, MR
|
2012-03-10 23:41:05 +02:00 |
|
|
Dmitriy Zaporozhets
|
0727edd8a0
|
Removed issues,mr delete buttons. Refactored models
|
2012-03-04 15:35:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
d6b051c5be
|
get rid of sidebar
|
2012-03-03 13:03:03 +02:00 |
|
|
Dmitriy Zaporozhets
|
065c200c33
|
removed unnecessary hr tags & titles
|
2012-02-26 22:06:40 +02:00 |
|
|
Dmitriy Zaporozhets
|
d41d8ffb02
|
Reply button, Comments for Merge Request diff
|
2012-02-24 22:19:47 +02:00 |
|
Dmitriy Zaporozhets
|
215a01f63c
|
move notes login to one controller
|
2012-02-24 09:16:06 +02:00 |
|
|
Dmitriy Zaporozhets
|
8c40aab120
|
Abilities extended. Resources security improved
|
2012-02-22 00:31:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
5c492a7089
|
make issue, commit row title color lighter
|
2012-02-20 21:50:11 +02:00 |
|
|
Dmitriy Zaporozhets
|
29c41e9a0e
|
pollishing UI
|
2012-02-20 21:38:59 +02:00 |
|
|
Dmitriy Zaporozhets
|
fa7bd43ab9
|
How to merge instructions
|
2012-02-18 14:43:35 +02:00 |
|
|
Dmitriy Zaporozhets
|
94db8a1c33
|
Usability & design improvements
|
2012-02-18 14:12:48 +02:00 |
|
|
Dmitriy Zaporozhets
|
8d493019c4
|
Show commits for merge request immediatly
|
2012-02-15 01:15:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
422e43989b
|
Compare view for commits
|
2012-02-06 22:32:04 +02:00 |
|
|
Dmitriy Zaporozhets
|
c90f1d5c8b
|
fixed issue, mr crash if assignee/author removed from team
|
2012-02-05 12:58:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
fca1ffb888
|
Bootstrap: Issues, Merge Requests, SSH Key completed
|
2012-01-29 23:59:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
a77c8bf9c3
|
Bootstrap: Issues & MR
|
2012-01-29 12:04:09 +02:00 |
|
|
Dmitriy Zaporozhets
|
d81f0b7845
|
Bootstrap: Merge Request -> Show
|
2012-01-28 17:21:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
0a4222fb98
|
Bootstrap: Activities
|
2012-01-28 16:47:55 +02:00 |
|
|
Dmitriy Zaporozhets
|
4d9c3f3123
|
Bootstrap: btn replacing
|
2012-01-27 09:19:55 +02:00 |
|