home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,605 Commits 48 Branches 340 Tags
1475cb9aaae75d37719c8eac92f9483bb2fde416
Commit Graph
168 Commits
Author SHA1 Message Date
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url 
Expose avatar_url in projects API
 2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09:00
Robert Schilling 1c7947ace0 Add UTF-8 character to version_sorter test 2015-02-25 21:40:27 +01:00
Robert Schilling c6e9d14ceb Update version sorter to 2.0.0, fixes #8572 2015-02-24 23:20:00 +01:00
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08: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
Douwe Maan 15bee7e0ff Fix Markdown relative links to files with anchors. 2015-02-18 12:32:20 +01: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
Jeroen van Baarsen 026e988544 Even more hound fixes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:00:55 +01:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Jeroen van Baarsen de1c450abd Started on the rspec upgrade 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 16:48:53 +01:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Dmitriy Zaporozhets c47328948b Fix specs for icons 2015-01-30 00:22:51 -08:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Marin Jankovski 4641514cbf Update rspec tests to the new external issue logic. 2015-01-26 15:59:40 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Hannes Rosenögger 6bf58e76bd Remove unnecessary / from avatar url 
So http://localhost:3000//uploads/user/avatar/1/avatar.png
becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
 2015-01-19 14:08:06 +01:00
Stefan Tatschner 089516209c Fixed tests 2015-01-15 14:01:12 +01:00
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&#39;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