Commit Graph
148 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer'
Conflicts:
	app/helpers/projects_helper.rb
2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets 4666515538 Merge branch 'flatten-dirs' into 'master'
Flatten the directory hierarchy while there is only one directory descendant

In some languages, especially java, the directory structure reflects the package structure.This means that using the file tree browser to reach the directories that matter you have to click a lot of directories containing only another subdirectory.

This merge request tries to enhance this by showing and providing the link to the first directory that doesn't contain only one directory.

See also [this feature request](http://feedback.gitlab.com/forums/176466-general/suggestions/6236769-jump-forward-to-the-first-folder-that-has-more-tha)

This is very similar to what [GitHub does](https://github.com/blog/1877-folder-jumping), but I don't think graying out the empty directories is really necessary.

Screenshots: [Before](https://gitlab.com/uploads/marmis85/gitlab-ce/b683a0000f/before.png) - [After](https://gitlab.com/uploads/marmis85/gitlab-ce/a23725a1c1/after.png)

I'm actually very new at ruby, rails, haml, and almost everything involved in Gitlab's development...
From what I could understand, when we render each directory item in the list we only have the data structure representing the item but not his descendants.
To iterate through the hierarchy I call Gitlab::Git:Tree.where() but I'm not sure if this is the most efficient way.

I also considered making every directory a clickable link, but I tried that and in the end it wasn't very useful and reduced the click target for the most useful directory.

See merge request !275
2015-01-11 04:42:28 +00:00
marmis85 02adb9ccd6 point to a specific branch in the test repo to avoid conflicts 2015-01-11 05:07:34 +01:00
marmis85 3efb06a22b Add test spec for TreeHelper module 2015-01-10 21:37:48 +01:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 939c046a98 Fix feature and tests 2015-01-08 13:21:00 -08:00
Marin Jankovski 3f1fad5f09 Add an avatar_url spec when relative url is set. 2014-12-05 15:59:55 +01:00
Valery Sizov f9a730ebb4 fix specs 2014-12-04 15:53:26 +02:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Vinnie Okada f2764e566e Use actual GitLab URL for test assertion
Assert the full GitLab root URL, including the port, instead of using a
regexp to tolerate whatever port is returned.
2014-10-18 00:04:21 -05:00
Vinnie Okada 786045ab81 Fix Rspec error when using non-default port
Prevent test failures when GitLab is configured to use a port other than
80.
2014-10-16 00:03:10 -05:00
Dmitriy Zaporozhets 4731d77bb2 Merge pull request #8020 from mr-vinn/note-trunc-link
Improve event note display in dashboard and project activity views
2014-10-13 11:40:50 +03:00
Vinnie Okada b3c70d001d Improve dashboard note view and add tests
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
2014-10-12 23:56:56 -05:00
Dmitriy Zaporozhets b956605f9e Merge branch 'ambiguous-sha' into 'master'
Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171
2014-10-12 20:28:21 +00:00
Dmitriy Zaporozhets 7a01d0cc74 Merge branch 'bug_with_apostrophe' into 'master'
Bug with apostrophe when at mentioning users

This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`.

Fixes #1034

See merge request !1165
2014-10-12 18:50:55 +00:00
Dmitriy Zaporozhets b02c21df5c Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-12 21:49:20 +03:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Marin Jankovski 1d14676e0c Substitute right single quote back with apostrophe. 2014-10-10 08:24:58 +02:00
Marin Jankovski a912308340 Add a test for apostrophe in code blocks. 2014-10-09 16:12:17 +02:00
Marin Jankovski 64e72af3cb Replace apostrophe with right single quote to avoid markdown interpretation as issue 39. 2014-10-09 14:20:49 +02:00
Marin Jankovski 099cf3558f Failing test for apostrophe at the end of user mention on project with issue iid 39. 2014-10-09 14:02:10 +02:00
Vinnie Okada fecd9c0cb2 Add specs for tasks
Add tests for the new task list functionality in the Markdown parser and
in issues and merge requests.
2014-10-05 22:15:36 -05:00
Vinnie Okada 8dce0cd215 Fix cross-project reference test
Test for the correct link text in cross-project references.
2014-10-05 10:46:52 -05:00
Vinnie Okada 1b1ba6b0a5 Implement cross-project Markdown references
Enable linking to commits, merge requests, and issues in other projects
by prepending a namespaced project path to the reference.
2014-10-03 12:30:20 -05:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Robert Schilling 390183a426 Factor out Emoji parsing using html-pipeline-gitlab 2014-09-26 01:32:33 +02:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Marin Jankovski 9b59570c8e Fix diff_helper spec. 2014-09-12 21:02:50 +02:00
Marin Jankovski 8ebb26fcc1 Add diff_helper spec. 2014-09-09 13:17:42 +02:00
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Dmitriy Zaporozhets fe228b89d5 Fix application helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-07 20:12:02 +03:00
Dmitriy Zaporozhets 349eaaa9c2 Fix gfm specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 12:15:05 +03:00
Dmitriy Zaporozhets d9d8d3b799 Fix old api compatibility and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 17:17:29 +03:00
Robert Schilling ceabda743a Improve markup gems 2014-07-28 11:47:27 +02:00
Dmitriy Zaporozhets 1e673c72a1 Improve markdown parsing
* dont try to build links for anchors like `#title-anchor`
* dont build relative url for project with empty repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 10:13:38 +03:00
Dmitriy Zaporozhets e44e2316c3 Change gravatar tests to identicon
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-17 09:40:48 +03:00
Dmitriy Zaporozhets 55d4e2647d Merge branch 'ce_issues_sentence' into 'master'
Issues sentence helper

This will make merging CE into EE later easier.
2014-06-14 09:39:19 +00:00
Dmitriy Zaporozhets e8f222e39c Fix helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 19:35:21 +03:00
Jacob Vosmaer d698535854 Add a test for issue sentence generation 2014-06-13 18:10:28 +02:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard
links to issues on main dashboard
2014-06-11 15:02:48 +03:00
Marvin Frick 587502390b fixes gitlab.com issue #229
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
2014-06-10 22:28:11 +02:00
Jeroen van Baarsen 597836d6cc Fixed some broken specs
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-08 23:27:57 +02:00
Marin Jankovski 1dca950c28 Fix failing submodule test. 2014-06-03 11:37:23 +02:00
Marin Jankovski 4a03bbe483 Add nofollow to all internal links. 2014-05-30 17:09:31 +02:00
skvandGitLab 9c046fea67 links to issues on main dashboard 2014-05-26 13:24:21 +00:00
Marin JankovskiandDmitriy Zaporozhets bb89661365 Better name for config variable. 2014-05-13 15:34:00 +03:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
2014-05-13 15:33:38 +03:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00