deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4263 commits 6 branches 43 tags 25 MiB
Commit graph

63 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
92039dd677 Developers can merge MR if target branch is not protected 2013-02-27 20:20:31 +02:00
Dmitriy Zaporozhets
5ac5510fd6 Fix automerge detection client-side since #3056 2013-02-26 10:47:27 +02:00
Dmitriy Zaporozhets
d7b667fee2 Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2 
Conflicts:
	app/models/merge_request.rb
 2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
28da2a8bdc Monkeypatch satellite call for merge request in tests 2013-02-21 11:44:33 +02:00
Andrew8xx8
6d68923edc human_merge_status replaced by human_merge_status_name 2013-02-20 17:50:29 +04:00
Andrew8xx8
b45e9aefd3 Merge Request uses StateMachine now 2013-02-18 14:43:50 +04:00
Andrew8xx8
8db3920c01 State renamed to merge_status 2013-02-18 14:43:49 +04:00
Riyad Preukschas
3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets
eded4bfa95 Raise exception and show message to user if repo missing satellite 2013-01-05 23:09:26 +02:00
Dmitriy Zaporozhets
dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Riyad Preukschas
db2c15369c Merge branch 'master' into discussions 
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
 2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Riyad Preukschas
494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas
9b919939a3 Fix parameter passing and wording for per line notes 2012-12-03 22:51:55 +01: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