24 May, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
23 May, 2014
1 commit
13 May, 2014
1 commit
-
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
08 May, 2014
1 commit
-
Add support for side-by-side inline comments
28 Apr, 2014
2 commits
24 Apr, 2014
1 commit
07 Apr, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
04 Apr, 2014
1 commit
20 Mar, 2014
1 commit
13 Mar, 2014
1 commit
-
…q into jacob-carlborg-toggle_diff_comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/stylesheets/sections/commits.scss app/assets/stylesheets/sections/notes.scss app/views/projects/commits/_diffs.html.haml features/steps/project/merge_requests.rb
04 Mar, 2014
1 commit
24 Feb, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
22 Feb, 2014
1 commit
-
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
20 Feb, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
11 Feb, 2014
1 commit
14 Jan, 2014
1 commit
-
…ecure_url returns an url which is accessible
01 Jan, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
31 Dec, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
30 Dec, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
26 Dec, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
25 Dec, 2013
2 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
18 Dec, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
14 Dec, 2013
1 commit
-
Clean up admin dashboad tooltips Clean up admin dashboad tooltips Clean up admin dashboad tooltips Add helper method change to use app helper Modify tooltips to use new helper Convert remaining times Adjust one tooltip
12 Dec, 2013
1 commit
-
Rails 4 does not generate token by default It fixes bug when you get to sign-in page after trying to upload image with comment Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
10 Dec, 2013
2 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
29 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
27 Nov, 2013
2 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
17 Nov, 2013
1 commit
-
TODO: fix comment forms to respect left and right columns
09 Oct, 2013
1 commit
24 Sep, 2013
1 commit
-
* Render right layout depends on current_user * show sample git username/email when repo is empty * Show extra info when browsing public area * Fixed some tests related to public projects * show comments in read-only for public projects * Remove old public routing
08 Aug, 2013
1 commit
-
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
04 Aug, 2013
3 commits
17 Jul, 2013
2 commits
-
-removed extranious space from new_merge_request_email.text.erb Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
-
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
