Dmitriy Zaporozhets
|
ca936d2784
|
Improve CI integration for merge requests
|
2012-12-11 06:14:05 +03:00 |
|
Riyad Preukschas
|
2b1afa0e62
|
Remove merge_request#raw and replace it with formats to #show
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
|
2012-11-25 00:05:44 +01:00 |
|
|
randx
|
679d0d6d76
|
Context refactoring. Move Issues list, Search logic to context
|
2012-10-09 22:09:46 +03:00 |
|
Cyril
|
be18397d82
|
rename ProjectController to ProjectResourceController
|
2012-09-27 20:59:42 +02:00 |
|
|
Cyril
|
078a8f0e66
|
factorize before_filters and layout for projects related controllers
|
2012-09-26 22:27:43 +02:00 |
|
|
Cyril
|
252d3a0c9d
|
remove duplicate before_filter
|
2012-09-25 22:38:11 +02:00 |
|
|
Cyril
|
2b38f51a17
|
fix merge request form
|
2012-08-25 00:22:45 +02:00 |
|
Robert Speicher
|
7754189187
|
Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
|
2012-08-10 18:25:15 -04:00 |
|
|
Riyad Preukschas
|
34cea1cb63
|
Update views to use CommitDecorator
|
2012-07-22 13:08:24 +02:00 |
|
Dmitriy Zaporozhets
|
3063af5adc
|
BaseContext
Controllers refactoring with contexts
Move commit compare logic to model
|
2012-07-20 08:39:34 +03:00 |
|
|
randx
|
264ee0c5a1
|
Tabs styled. MR Get Patch
|
2012-07-05 01:26:23 +03:00 |
|
|
randx
|
2def1c7217
|
Merge Request -> show. Refactored. f5 support for diff
|
2012-06-29 21:55:22 +03:00 |
|
|
Dmitriy Zaporozhets
|
50fdb2e7df
|
Remove critical status from Issue. Move sort instead
|
2012-06-27 21:30:35 +03:00 |
|
|
Dmitriy Zaporozhets
|
a243253b10
|
Refactored project archive. Improved MR usability form
|
2012-06-13 09:03:53 +03:00 |
|
|
Dmitriy Zaporozhets
|
e0d1fba15e
|
Recent push event
|
2012-06-12 17:43:16 +03:00 |
|
Zevs
|
3b41b1839b
|
ability to remove source branch after merge
|
2012-06-05 00:11:07 +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
|
45b18365d5
|
Fix an issue with MR unavailable if remove source branch
|
2012-04-19 23:06:45 +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
|
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
|
78d620b3b6
|
Raw gitlab automerge feature
|
2012-03-29 18:03:05 +03:00 |
|
|
randx
|
52d8ed9e4f
|
Pagination for Merge Requests. Fixed for issues
|
2012-03-22 00:09:57 +02:00 |
|
|
Dmitriy Zaporozhets
|
2ec12c9bb8
|
Impoved merge requests show page. Minor style improvements across project
|
2012-03-16 01:45:46 +02:00 |
|
|
Dmitriy Zaporozhets
|
5a3f23f395
|
Persist Merge Request diff. Auto merge request close on push
|
2012-03-15 00:57:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
3676838dc9
|
Rspec test repo replaced.\nMerge Requests improved
|
2012-03-13 23:54:49 +02:00 |
|
Andrey Janzen
|
34ea7fdb36
|
fix typo
|
2012-03-12 09:02:05 +07:00 |
|
|
Dmitriy Zaporozhets
|
94befdd502
|
Events improved. Open/close issue, merge request events displayed
|
2012-03-07 00:13:43 -08:00 |
|
|
Dmitriy Zaporozhets
|
0727edd8a0
|
Removed issues,mr delete buttons. Refactored models
|
2012-03-04 15:35:15 +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
|
7d279f9302
|
better error handling for not found resource, gitolite error
|
2012-02-22 07:14:54 +02:00 |
|
|
Dmitriy Zaporozhets
|
8c40aab120
|
Abilities extended. Resources security improved
|
2012-02-22 00:31:18 +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
|
ef396d08fc
|
Fixed encoding issue for diff. Reordered merge request commits
|
2012-02-15 00:41:51 +02:00 |
|
|
Dmitriy Zaporozhets
|
6c416aaac8
|
Issues, MR, Wall can be enabled/disabled per project
|
2012-02-06 19:40:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
0a4222fb98
|
Bootstrap: Activities
|
2012-01-28 16:47:55 +02:00 |
|
|
Dmitriy Zaporozhets
|
e48a0b8eab
|
usability improvements
|
2012-01-21 23:17:29 +02:00 |
|
|
Dmitriy Zaporozhets
|
8c46123f99
|
fixed merge request diffissues 355, 351
|
2012-01-20 09:49:48 +02:00 |
|
|
Dmitriy Zaporozhets
|
ccc9bed893
|
Abilities refactoring
|
2011-12-15 23:57:46 +02:00 |
|
|
Dmitriy Zaporozhets
|
3a50b6cac9
|
merge request show page refactored
|
2011-12-13 23:56:04 +02:00 |
|
|
Dmitriy Zaporozhets
|
79b64ef4ac
|
fixed merge request diff
|
2011-11-29 20:06:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
8803fbb593
|
merge request: notes, diffs, commits
|
2011-11-28 22:16:57 +02:00 |
|
|
Dmitriy Zaporozhets
|
6b941cf92c
|
merge request list
|
2011-11-28 20:30:35 +02:00 |
|
|
Dmitriy Zaporozhets
|
6d460aa2d6
|
merge request entity
|
2011-11-28 09:39:43 +02:00 |
|