summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
|
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-291-1/+10
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-283-6/+4
|\ | | | | | | hotfix/ruby-21-broken-update
| * Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-283-6/+4
| |\ | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| | * Add icon for private forks notice. #2406Rubén Dávila2016-01-201-1/+1
| | |
| | * Fix broken specs. #2406Rubén Dávila2016-01-201-4/+2
| | |
| | * Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-202-3/+3
| | |
* | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-282-2/+2
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-272-2/+6
|\ \
| * \ Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
| | * | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-1/+5
| | | | | | | | | | | | | | | | Closes #12677
| * | | Adds base64 background search icon.Jacob Schatz2016-01-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value.
* | | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-252-2/+2
|/ /
* | Backport some changes from EEes_backportValery Sizov2016-01-221-0/+75
| |
* | Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-212-7/+7
| |
* | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-2/+1
| |
* | Restore helperDouwe Maan2016-01-201-0/+4
| |
* | Move parallel diff logic to separate classDouwe Maan2016-01-201-104/+0
| |
* | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-2/+6
| |
* | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1411-51/+55
|\ \ | |/
| * Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| | * Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-141-1/+1
| | |
| * | Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-141-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | Standartize buttons and fields size Fixes #8069 and #8070 See merge request !2428
| | * Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-141-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-141-3/+5
| |\ \ | | |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * New layout without background colorDmitriy Zaporozhets2016-01-131-3/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-131-0/+10
| | |
| * | Update broadcast_message helperRobert Speicher2016-01-132-10/+14
| | | | | | | | | | | | | | | Now it returns the fully-formatted message so we can be consistent about how it's shown.
| * | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-131-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | enable milestone filter to stick See merge request !2241
| | * enable milestone filter to stickGreg Smethells2016-01-121-1/+1
| | |
| * | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-1/+1
| |/ | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
| * Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve button styles I noticed a couple of buttons don't match the newer styles. ## Issue edit note form ### Current (cancel button is big) ![Screen_Shot_2016-01-08_at_2.18.29_PM](/uploads/c7928e6644e886090f55cb61076c9e89/Screen_Shot_2016-01-08_at_2.18.29_PM.png) ### Now ![Screen_Shot_2016-01-08_at_2.18.22_PM](/uploads/d15c3c458a08ce5a59c367c7fb379c31/Screen_Shot_2016-01-08_at_2.18.22_PM.png) ## Merge request code discussion ### Current ![Screen_Shot_2016-01-08_at_2.21.37_PM](/uploads/b970ff3e5d9ef5e62f83bb56d5505f8d/Screen_Shot_2016-01-08_at_2.21.37_PM.png) ### Now (Also changed to `btn-save` class which changes to green. This matches everything else) ![Screen_Shot_2016-01-08_at_2.22.01_PM](/uploads/ed520de72177de92efe21d236bb04d24/Screen_Shot_2016-01-08_at_2.22.01_PM.png) cc/ @jschatz1 @skyruler @creamzy See merge request !2350
| | * Improve button stylesDrew Blessing2016-01-081-1/+1
| | |
| * | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
| | |
| * | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of getting issues on group level For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests. Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 See merge request !2318
| | * Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
| * | Merge branch 'sorting-dropdown-order' into 'master' Dmitriy Zaporozhets2016-01-081-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | changes titles Fixes #5909 See merge request !2334
| | * | changes titlessorting-dropdown-orderJacob Schatz2016-01-071-2/+2
| | |/
| * | Use `xmlschema` where even more appropriate!Robert Speicher2016-01-071-1/+1
| | |
| * | Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-071-1/+1
| | |
| * | Add two custom Date/Time conversion formatsRobert Speicher2016-01-071-1/+1
| | |
| * | Remove stamp gemRobert Speicher2016-01-071-1/+1
| |/ | | | | | | Closes #5908
| * Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-061-20/+5
| |\ | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211
| | * Don't override issue page description in project layout.Douwe Maan2016-01-061-8/+3
| | |
| | * Make `page_description` less magical :sparkles:Robert Speicher2016-01-051-11/+1
| | |
| | * Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher2016-01-051-6/+4
| | |
| | * Merge branch 'master' into more-opengraphDouwe Maan2016-01-053-3/+19
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml
| | * | Add Open Graph data for group, project and commit.Douwe Maan2015-12-251-0/+2
| | | |
| * | | Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-061-1/+1
| | |/ | |/|
| * | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-041-1/+1
| | |
View Lorry Controller Status