summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-062-2/+2
|
* Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-051-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update timeago to shorter representation ## What does this MR do? Shortens representation of `Finished at` block in pipelines & builds ## What are the relevant issue numbers? Closes #19752 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_8.54.44_AM](/uploads/85000549c49165d4481422eac5eb0ca9/Screen_Shot_2016-07-14_at_8.54.44_AM.png) See merge request !5225
| * Update timeago to shorter representation19752-pipelines-finished-atAnnabel Dunstone2016-08-041-2/+6
| |
* | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-14/+25
|/
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-4/+1
| | | | So we have raw_diffs too
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
| | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-032-8/+7
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-021-32/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to external issue tracker from `/issues` Prior, in order to display the correct link to "Issues" in the project navigation, we were performing a check against the project to see if it used an external issue tracker, and if so, we used that URL. This was inefficient. Now, we simply _always_ link to `namespace_project_issues_path`, and then in the controller we redirect to the external tracker if it's present. This also removes the need for the `url_for_issue` helper. Bonus! :tada: See merge request !5608
| * Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-011-16/+0
| | | | | | | | | | Now we link to the standard `IssuesController#new` action, and let it redirect if we're using an external tracker.
| * Redirect to external issue tracker from `/issues`Robert Speicher2016-08-011-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Prior, in order to display the correct link to "Issues" in the project navigation, we were performing a check against the project to see if it used an external issue tracker, and if so, we used that URL. This was inefficient. Now, we simply _always_ link to `namespace_project_issues_path`, and then in the controller we redirect to the external tracker if it's present. This also removes the need for the url_for_issue helper. Bonus! :tada:
* | Merge branch '14202-speed-up-diff-note-active' into 'master' Yorick Peterse2016-08-021-0/+4
|\ \ | | | | | | | | | | | | Speedup DiffNote#active? on discussions See merge request !5597
| * | Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵Paco Guzman2016-08-021-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | touching git repository to return diff_refs when possible - Preloading noteable we share the same noteable instance when more than one discussion refers to the same noteable. - Any other call to that object that is cached in that object will be for any discussion. - In those cases where merge_request_diff has all the sha stored to build a diff_refs get that diff_refs using directly those sha instead accessing to the git repository to first get the commits and later the sha.
* | Merge branch '20101-ci-configuration' into 'master' Fatih Acet2016-08-021-0/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""CI configuration" button when `.gitlab-ci.yml` is present" ## What does this MR do? Adds `CI configuration` button to project overview page ## What are the relevant issue numbers? Closes #20101 ## Screenshots (if relevant) ![Screen_Shot_2016-07-28_at_11.51.32_AM](/uploads/499d942d203d287ae98b7589ef12673c/Screen_Shot_2016-07-28_at_11.51.32_AM.png) See merge request !5558
| * Link configuration button to .gitlab-ci.yml20101-ci-configurationAnnabel Dunstone2016-07-281-0/+4
| |
* | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-012-3/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sensible state specific default sort order for issues and merge requests ## What does this MR do? It provides more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created | ## Are there points in the code the reviewer needs to double check? All the bits where `id_desc` was changed to `created_desc`. I hope it's okay, It makes more sense in my opinion. ## Why was this MR needed? Prior to this MR the issues and merge request were sorted based on `id_desc` by default. This MR aims to make the interface more user-friendly by providing state specific sorting defaults most users would expect. ## What are the relevant issue numbers? See #15064 See merge request !5453
| * | State specific default sort order for issuableszs2016-08-012-3/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created |
* | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-291-1/+1
| | | | | | | | | | | | | | On a merge request with over 1000 changed files, there were redundant calls to blob_text_viewable?, which incurred about 7% of the time. Improves #14775
* | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-291-2/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop cops that check access modifiers ## What does this MR do? This MR enables Rubocop cops that detect methods that should be restricted but are the part of public API because of access modifiers used improperly. This also fixes existing offenses. ## Why was this MR needed? Some method in our codebase are public instead of being private because it is sometimes difficult to get it right without static analysis. ## What are the relevant issue numbers? See #17478 Closes #17372 See merge request !5014
| * Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-191-2/+0
| |
* | Allow skipping users in autocompleteallow-skipping-users-in-autocompleteSean McGivern2016-07-271-13/+17
| | | | | | | | | | | | Pass an array of user IDs in the `skip_users` param to have them excluded from the results (unless they are explicitly included through the `current_user` or `author_id` params).
* | Optimize maximum user access level lookup in loading of notesStan Hu2016-07-261-8/+7
| | | | | | | | | | | | | | | | NotesHelper#note_editable? and ProjectTeam#human_max_access currently take about 16% of the load time of an issue page. This MR preloads the maximum access level of users for all notes in issues and merge requests with several queries instead of one per user and caches the result in RequestStore.
* | Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-251-0/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Users can filter branches by name on project branches page This MR aims to solve #18674 by adding the possibility to filter project branches by name ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png) See merge request !5144
| * \ Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-229-70/+106
| |\ \
| * | | implements the basic filter functionalitytiagonbotelho2016-07-191-0/+11
| | |/ | |/|
* | | Remove magic comments from Ruby files (!5456)winniehell2016-07-241-1/+0
| |/ |/|
* | fix missing repo_ref parambarthc2016-07-221-1/+2
| |
* | Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-212-34/+19
|\ \ | | | | | | | | | | | | | | | | | | Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
| * | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-202-34/+19
| | |
* | | Fix ci icons getting cut offAnnabel Dunstone2016-07-211-2/+2
| | |
* | | Cast duration to integer in `TimeHelper#time_interval_in_words`Rémy Coutable2016-07-211-0/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-201-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn on failure ## What does this MR do? Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models. ## Are there points in the code the reviewer needs to double check? Not at the moment, though I think I'll probably need help getting this to work in the backend. ## What are the relevant issue numbers? #17669 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @ayufan See merge request !5004
| * \ Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-202-20/+20
| |\ \
| * | | Use switch statements instead of if/else chains.Connor Shea2016-07-191-2/+3
| | | |
| * | | Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-191-0/+4
| | |/ | |/|
* | | Merge branch 'add-link-to-commit-avatar' into 'master' Rémy Coutable2016-07-202-10/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to profile to commit avatar ## What does this MR do? - links to user profiles to the avatars on commits page - tooltips to the avatars on commits page side effect: - links to user profiles to the avatars on pipelines page - tooltips to the avatars on pipelines page - tooltips to the avatars on activity page - mailto links to the avatars on activity page for non-registered users ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? There were no links nor Zeldas. ## What are the relevant issue numbers? fixes #19644 See merge request !5163
| * | | Add link to user profile to commit avatar (!5163)winniehell2016-07-202-10/+30
| | | |
* | | | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-201-0/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow slack service to send messages on different channels closes #8110 ## Allow slack service to send messages on different channels ![new_slack_service](/uploads/87de0bd6b02a4f7853358676b5e74dff/new_slack_service.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5124
| * | | Refactor service settings viewissue_8110Felipe Artur2016-07-201-7/+7
| | | |
| * | | Add project service documentation and update integration documentationFelipe Artur2016-07-191-2/+2
| | | |
| * | | Allow slack service to send messages on different channelsFelipe Artur2016-07-191-0/+25
| | |/ | |/|
* | | Merge branch 'external-wiki-helper-speedup' into 'master' Yorick Peterse2016-07-201-3/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | speed up ExternalWikiService#get_project_wiki_path ## What does this MR do? Speed up ExternalWikiHelper#get_project_wiki_path ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See issue #19886 ## What are the relevant issue numbers? #19886 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5305
| * | speed up ExternalWikiService#get_project_wiki_pathEugene Howe2016-07-191-3/+2
| |/ | | | | | | | | | | | | | | * This method previously iterated over all services in a project. Now it will directly query the ExternalWikiService for the project and filter by active state. * The presence of an external wiki is also cached * When an external wiki is added or removed, the cached value is updated
* | Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' Kamil Trzciński2016-07-191-13/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build duration when build is not finished yet ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Fixes #19937. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5323
| * | Fix build duration when build is not finished yet19937-fix-wrong-build-elapsed-timeRémy Coutable2016-07-181-13/+13
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Add new icons for every CI statusAnnabel Dunstone2016-07-191-6/+8
| | |
* | | Add new running icon; add a bunch of styles to get svg to match existing fa ↵Annabel Dunstone2016-07-191-2/+2
| |/ |/| | | | | icons
* | Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapsed diffs lines/size don't accumulate to overflow diffs. ## What does this MR do? Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by !4990 as you can see on the issue description #19820 . We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files). We still need to bump the gitlab_git and point this branch to the new gitlab_git version. ## What are the relevant issue numbers? Closes #19820 Closes #19885 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5306
| * | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-4/+5
| |/
* | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
|/ | | | | | | | This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-151-1/+1
| | | This reverts merge request !4970