summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into markdown-tagsVinnie Okada2015-03-241-0/+11
|\
| * Fix nested task listsVinnie Okada2015-03-211-0/+11
| | | | | | | | | | When nesting task list items, the parent item is wrapped in a `<p>` tag. Update the task list parser to handle these paragraph wrappers.
* | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-1716-322/+617
|\ \ | |/ | | | | Use the latest HTML pipeline gem
| * Use `project_member` instead of `team_member`.Douwe Maan2015-03-151-1/+1
| |
| * Fix specsDmitriy Zaporozhets2015-03-122-18/+21
| |
| * Fix tests for emojioneDmitriy Zaporozhets2015-03-111-3/+3
| |
| * Fix code preview theme setting for comments, issues, merge requests, and ↵Stan Hu2015-03-101-0/+12
| | | | | | | | | | | | | | | | | | | | snippets. Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
| * Automatically link commit ranges to compare page.Douwe Maan2015-03-071-0/+48
| |
| * Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-011-2/+4
| |\ | | | | | | Expose avatar_url in projects API
| | * Expose avatar_url in projects APIsue4452015-03-011-2/+4
| | | | | | | | | | | | | | | | | | * Impl Project#avatar_url * Refactor ApplicationHelper: Use Project#avatar_url * Update changelog
| * | Add UTF-8 character to version_sorter testRobert Schilling2015-02-251-4/+4
| | |
| * | Update version sorter to 2.0.0, fixes #8572Robert Schilling2015-02-241-2/+4
| |/
| * Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ↵Marin Jankovski2015-02-231-3/+3
| | | | | | | | rubocop warnings in path.
| * Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-191-1/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix Markdown relative links to files with anchors.Douwe Maan2015-02-181-1/+13
| | |
| * | Upgrade to Rails 4.1.9Vinnie Okada2015-02-144-25/+25
| |/ | | | | | | | | | | 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.
| * Even more hound fixesJeroen van Baarsen2015-02-124-39/+69
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-1213-242/+244
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * Started on the rspec upgradeJeroen van Baarsen2015-02-121-3/+3
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * Adds persistent collapse button for left side barJason Blanchard2015-02-031-0/+25
| |
| * Fix specs for iconsDmitriy Zaporozhets2015-01-301-0/+3
| |
| * Build the urls inside of the service.Marin Jankovski2015-01-281-0/+1
| |
| * Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-261-51/+73
| |\ | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb
| | * Fix tests, merge conflicts, some minor issues and make the project avatar ↵Hannes Rosenögger2015-01-241-53/+53
| | | | | | | | | | | | feature mergable
| | * adding avatar to project settings page added avatar removal show project ↵Steven Thonus2015-01-241-0/+22
| | | | | | | | | | | | 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
| * | Update rspec tests to the new external issue logic.Marin Jankovski2015-01-263-36/+17
| |/
| * Remove unnecessary / from avatar urlHannes Rosenögger2015-01-191-1/+1
| | | | | | | | | | So http://localhost:3000//uploads/user/avatar/1/avatar.png becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
| * Fixed testsStefan Tatschner2015-01-152-2/+3
| |
| * Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-131-0/+9
| |\ | | | | | | | | | | | | Conflicts: app/helpers/projects_helper.rb
| | * Github ImporterValery Sizov2015-01-101-0/+9
| | |
| * | Merge branch 'flatten-dirs' into 'master'Dmitriy Zaporozhets2015-01-111-0/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | point to a specific branch in the test repo to avoid conflictsmarmis852015-01-111-1/+1
| | | |
| | * | Add test spec for TreeHelper modulemarmis852015-01-101-0/+28
| | |/
| * | Fix feature and testsDmitriy Zaporozhets2015-01-081-1/+1
| |/
| * Add an avatar_url spec when relative url is set.Marin Jankovski2014-12-051-0/+10
| |
| * fix specsValery Sizov2014-12-041-10/+13
| |
| * added helperValery Sizov2014-12-041-0/+17
| |
| * Use actual GitLab URL for test assertionVinnie Okada2014-10-181-1/+3
| | | | | | | | | | Assert the full GitLab root URL, including the port, instead of using a regexp to tolerate whatever port is returned.
| * Fix Rspec error when using non-default portVinnie Okada2014-10-161-1/+1
| | | | | | | | | | Prevent test failures when GitLab is configured to use a port other than 80.
| * Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-131-0/+52
| |\ | | | | | | Improve event note display in dashboard and project activity views
| | * Improve dashboard note view and add testsVinnie Okada2014-10-121-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-121-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix testsDmitriy Zaporozhets2014-10-121-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'bug_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-10-121-0/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Substitute right single quote back with apostrophe.Marin Jankovski2014-10-101-2/+2
| | | |
| | * | Add a test for apostrophe in code blocks.Marin Jankovski2014-10-091-0/+8
| | | |
| | * | Replace apostrophe with right single quote to avoid markdown interpretation ↵Marin Jankovski2014-10-091-2/+2
| | | | | | | | | | | | | | | | as issue 39.
| | * | Failing test for apostrophe at the end of user mention on project with issue ↵Marin Jankovski2014-10-091-0/+10
| | |/ | | | | | | | | | iid 39.
| * | Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-101-1/+13
| |/
* | Allow HTML tags in user Markdown inputVinnie Okada2014-10-101-0/+30
|/ | | | | Allow whitelisted tags to appear in rendered HTML output by disabling Redcarpet's `:filter_html` option.
View Lorry Controller Status