home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,335 Commits 48 Branches 340 Tags
d63371ad783db055da840be37ddac0cdcb49db2c
Commit Graph
47 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names 
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:55:56 +02:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view 
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
 2015-06-16 06:11:59 -07:00
Dmitriy Zaporozhets e11e042d89 Fix diff header with submodule change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 11:01:40 +02:00
Alex ConnorandJeroen van Baarsen 3c892f3554 Disabled expansion of top/bottom blobs for new file diffs 2015-05-21 09:25:07 +02:00
Alex Lossent affd049dc4 Improve handling of large diffs 
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
 2015-05-05 18:51:12 +02:00
Stan Hu 72a7febead Fix "Revspec not found" errors when viewing diffs in a forked project with submodules 
Closes #1413
 2015-04-27 20:42:38 -07:00
Dominik Sander d4fec49abc Fix merge request comments on files with multiple commits 
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.

 * `Note#set_diff` do not use stored the diff when creating a new note
   in merge requests (we can not be sure the diff did not changed since
   the last comment on that line)
 * Do not rely just on `outdated?` of the first note when displaying
   comments of a MR in the discussion tab, but partition the
   active/outdated notes and display them all
 * In the inline changes tab just select the active notes, so an
   outdated note does not prevent an active one from being rendered
 * Just show active comments in the side-by-side changes tab
 2015-04-15 18:23:57 +02:00
Dmitriy Zaporozhets c543cd1ed3 Fix performance issue when browse big diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-13 15:51:28 +03:00
Dmitriy Zaporozhets f2ea9d9f3f Improve sticky headers in diffs 
* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab
 2015-03-24 19:00:00 -07:00
Dmitriy Zaporozhets 2cd6cc7fed Merge branch 'improve-diff-header' into 'master' 
Fix file mode going to next line in diff header

See merge request !432
 2015-03-24 00:09:40 +00:00
Dmitriy Zaporozhets 61700f619c Fix file mode going to next line in diff header 2015-03-23 09:38:52 -07:00
Douwe Maan a30645c68f Don't show commit comment button when user is not signed in. 2015-03-23 16:17:10 +01:00
Dmitriy Zaporozhets 1cf138170c Add tooltip for comment toggle in diff. Add changelog item and fix tests 2015-03-18 20:12:19 -07:00
Dmitriy Zaporozhets e07d32eb41 Add some space aroung diff stats block 2015-03-18 19:21:24 -07:00
Dmitriy Zaporozhets 22038106b4 Replace show diff button with link 2015-03-18 19:11:27 -07:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Hannes Rosenögger 120f032b1a enable line wrapping by default and remove the checkbox to change it 2015-03-18 08:46:53 +01:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push' 
Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb
 2015-03-08 16:49:11 -07:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets 1da71cc520 Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
Douwe Maan 7b34c9dc59 Add list of changed files to EmailsOnPush. 
See #1906.
 2015-02-25 13:40:05 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00
Sytse Sijbrandij ee804e2d94 Better English in the performance diff message. 2015-02-14 12:13:31 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Dmitriy Zaporozhets eb84ee7a20 Better label for diffs 2015-01-15 15:19:58 -08:00
Arif Ali 1d8dcfaf8b fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem 2014-12-30 21:59:38 +00:00
Dmitriy Zaporozhets 5140a4cd13 Set of UI changes mostly for issue and merge request 
* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:32:49 +02:00
Dmitriy Zaporozhets e007d810c9 Merge pull request #7886 from cirosantilli/disable-blob-edit-mr 
Disable / hide MR edit blob button if cannot edit.
 2014-12-20 20:19:38 +02:00
Vinnie Okada 0084b8a776 Display renamed files in diff views 
Show both the old and new filenames when viewing the diff for a renamed
file.
 2014-10-06 21:42:07 -05:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 81eacd1b2a Disable / hide MR edit blob button if cannot edit. 2014-10-02 12:12:51 +02:00
Ciro Santilli da4eff4add Only show text wrap and diff notes for text in MR. 2014-09-29 14:48:05 +02:00
Dmitriy Zaporozhets b897cc63a5 Fix 500 error on diff if file permission changed 2014-09-23 16:14:17 +03:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Ciro Santilli 84bbf07d96 Typo localy -> locally. 2014-09-10 22:20:40 +02:00
Marin Jankovski 11eec88d97 Wrap should always be enabled for parallel diff. 2014-09-10 16:46:10 +02:00
Marin Jankovski 2ff83aa389 Fix typo. 2014-09-09 11:52:16 +02:00
Marin Jankovski ac6a107ac7 Add line code to parallel diff for linking. 2014-09-09 11:36:29 +02:00
Dmitriy Zaporozhets 93dc885530 Fix usage of diff file mode change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:25:20 +03:00
Dmitriy Zaporozhets 02e87d9223 optimize show_diff_size_warning? 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:12:54 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets c741fcab9d Fix all broken stuff after diff refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:41:55 +03:00
Dmitriy Zaporozhets e0eb48031d Refactor diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:26:49 +03:00