home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
112 Commits
Author SHA1 Message Date
Annabel Dunstone d76878b960 Diff touch ups 2016-04-07 15:33:18 -07:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone de63de18d7 Update diff colors and icons 2016-04-07 15:33:18 -07:00
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches 
Closes #14875
 2016-04-04 04:51:05 -07:00
Jacob Schatz 0305dd98b3 Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' 
change the css class has_tooltip to has-tooltip universally

closes #14432 

See merge request !3321
 2016-03-21 20:40:14 +00:00
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master' 
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
 2016-03-21 10:46:37 +00:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Stan Hu 79ad6e0e38 Fix bug where wrong commit ID was being used in a merge request diff to show old image 
Closes #3769

Closes #14327
 2016-03-19 13:28:40 -07:00
Douwe Maan afbcdd8e7f Move diff line to separate partial 2016-03-19 20:04:23 +01:00
Yorick Peterse 3f0d780c19 Show a notice for diffs that are too large 
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
 2016-03-18 12:30:46 +01:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Phil Hughes 2f0c3ca352 Changed too many changes buttons to white 
Closes #13751
 2016-02-29 09:18:29 +00:00
Zeger-Jan van de Weg 11ed1cbbb7 Emoji reponses on diffs aren't award emoji 2016-02-19 10:04:38 +01:00
Jacob Vosmaer a87fe2a472 Fixes requested by Rémy 2016-02-17 11:08:47 +01:00
Jacob Vosmaer 24fa458615 Use /raw/ requests for image diffs 2016-02-16 17:29:45 +01:00
Rémy Coutable 5cd20de749 Eager-load image blob data in diffs 
Since gitlab_git 8.0, blob data are lazy-loaded so we have to call
blob.load_all_data!(repo) to eager-load them.

Fixes #13458.
 2016-02-16 10:50:24 +01:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Robert Speicher 5f0d7e2e3b Merge branch 'fix-mr-diff-edit-button' into 'master' 
Fix MR diff 'Edit' button

It now works and has the right size.

See merge request !2542
 2016-01-22 07:39:33 +00:00
Robert Speicher 2fed8bf390 Merge branch 'fix-diff-comments' into 'master' 
More highlighted diff fixes

See merge request !2545
 2016-01-22 07:37:47 +00:00
Douwe Maan 16d17b78ca Restore diff comments 2016-01-22 02:10:58 +01:00
Douwe Maan 9369b7ec1f Fix MR diff 'Edit' button 2016-01-21 22:46:49 +01:00
Douwe Maan 21facf5353 Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets 2016-01-21 14:23:53 +01:00
Douwe Maan 0e992a3b4e Properly highlight lines around '\ No newline at end of file' 2016-01-20 19:20:13 +01:00
Douwe Maan 701513dcc7 Move parallel diff logic to separate class 2016-01-20 14:53:20 +01:00
Rubén Dávila c8db25c37c Merge branch 'master' into issue_3945 2016-01-14 17:28:44 -05:00
Rubén Dávila 6b9c730e91 More refactoring from last code review. #3945 
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
 2016-01-14 16:47:55 -05:00
Douwe Maan 8dfad143d4 Add inline diff markers in highlighted diffs. 2016-01-14 22:28:07 +01:00
Douwe Maan c881627d11 Refactor parallel_diff generation a bit. 2016-01-14 14:52:08 +01:00
Dmitriy Zaporozhets bb5213588b Update files/diffs to match new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 12:31:31 +01:00
Rubén Dávila 0f0af19139 Little refactor for usage of html_safe. #3945 2016-01-13 11:39:15 -05:00
Rubén Dávila 48c45ba9a8 Use html_safe instead of raw. #3945 2016-01-13 10:58:19 -05:00
Rubén Dávila 80a4c808b1 Make diff_line_content helper return a safe String. #3945 2016-01-12 11:02:16 -05:00
Rubén Dávila 78d7c0e0d8 Fix broken specs. #3945 2016-01-08 19:05:55 -05:00
Rubén Dávila 21b602c60a Change strategy to highlight diffs. #3945 
Now we apply syntax highlighting to the whole old and new files.
This basically help us to highlight adequately multiline content.
 2016-01-07 22:37:01 -05:00
Rubén Dávila 21958a3939 Add some styling for syntax highlighting themes. #3945 2016-01-07 13:45:19 -05:00
Rubén Dávila 1494bb3f25 Force white theme when viewing diffs. #3945 2016-01-06 21:01:44 -05:00
Rubén Dávila 776d70d11b Use #html_safe instead of #raw in some diff views. #3945 2016-01-06 19:54:36 -05:00
Rubén Dávila 7de90f4b53 Fix broken spec and small refactor. #3945 2015-12-30 18:42:11 -05:00
Rubén Dávila bb96d63153 New implementation for highlighting diff files. #3945 
* It is more performant given now we process all the diff file instead
  of processing line by line.
* Multiline comments are highlighted correctly.
 2015-12-30 00:52:50 -05:00
Rubén DávilaandRubén Dávila 34657b821a Add syntax highlighting to diff view. #3945 2015-12-28 18:31:27 -05:00
Douwe Maan f4f4a6b530 Fix specs and behavior for LFS files 2015-12-18 16:14:12 +01:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Marin Jankovski bf17609e2a Rename blob helper, bump version of gitlab_git to 7.2.21. 2015-12-07 15:56:38 +01:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Douglas Barbosa Alexandre 12fdc13ad3 Fix 500 error when creating a merge request that removes a submodule 2015-12-04 17:35:14 -02:00
Marin Jankovski b9a0f96d42 Don't show diffs for lfs pointers. 2015-12-04 12:01:08 +01:00
Dmitriy Zaporozhets ca7e31c48f Merge branch 'ui/consistency' into 'master' 
UI: Improve consistency across the board

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577

See merge request !1954
 2015-12-02 22:17:48 +00:00
Douwe Maan 59c3ec4e67 Use file-type specific file icon in blame view and diff item 2015-12-02 14:55:36 +01:00
Douwe Maan 3ad1d320ef Remove duplicated styling for center top menus 2015-12-02 14:49:12 +01:00