Dmitriy Zaporozhets
|
5ac5510fd6
|
Fix automerge detection client-side since #3056
|
2013-02-26 10:47:27 +02:00 |
|
Andrew8xx8
|
6d68923edc
|
human_merge_status replaced by human_merge_status_name
|
2013-02-20 17:50:29 +04:00 |
|
|
Andrew8xx8
|
e2d94e0719
|
State machine added for merge_status field
|
2013-02-20 17:49:48 +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 |
|
Koen Punt
|
a1566a9c86
|
Converted merge_requests.js to coffeescript and updated code
|
2013-01-05 02:53:34 +01: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
|
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
|
06ea122840
|
Refactor diff notes creation
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
3bc507e5c5
|
Rename diff note partials
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
7971383d53
|
Rename the "Comments" tab for merge requests "Discussion"
|
2012-12-03 22:51:55 +01:00 |
|
|
Riyad Preukschas
|
9b919939a3
|
Fix parameter passing and wording for per line notes
|
2012-12-03 22:51:55 +01:00 |
|
|
Riyad Preukschas
|
b8113334a8
|
Highlight voting notes for issues and merge requests
|
2012-09-15 11:54:46 +02:00 |
|
|
Riyad Preukschas
|
61eb650db0
|
Rename 'notes/notes' partial to 'notes/notes_with_form'
|
2012-09-14 21:41:56 +02:00 |
|
|
randx
|
8eaead6a01
|
Text message for mergeing MR
|
2012-08-19 00:45:46 +03: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 |
|
|
randx
|
2def1c7217
|
Merge Request -> show. Refactored. f5 support for diff
|
2012-06-29 21:55:22 +03:00 |
|