summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
| * | fix bug in webpack_helper in which force_same_domain argument was ignored ↵fix-local-rspec-testsMike Greiling2018-01-251-1/+1
| | | | | | | | | | | | breaking local rspec tests
* | | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-251-3/+3
| | |
* | | Use limit for search count queriessearch-100Jan Provaznik2018-01-231-0/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-221-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Password authentication enabled for Git over HTTP(S) can not be disabled via UI" Closes #42206 See merge request gitlab-org/gitlab-ce!16577
| * | Permits 'password_authentication_enabled_for_git' parameter for ↵Mark Fletcher2018-01-191-0/+1
| | | | | | | | | | | | ApplicationSettingsController
* | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-191-0/+16
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * | Initial work to add notification reason to emailsMario de la Ossa2018-01-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | | WebIDE: Fix Commit bugsTim Zallmann2018-01-191-6/+8
| | |
* | | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406
| * | | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247
* | | Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-181-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
| * | Remove unnecessary query from labels filterFelipe Artur2018-01-181-0/+6
| | |
* | | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-172-2/+10
| |/ |/|
* | Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-mergeSean McGivern2018-01-161-0/+2
|/ | | | | | We should use this limit everywhere, but especially in project search results, where we could be highlighting very long single lines. (Typical examples: minified JavaScript, and JSON data files.)
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-115-0/+5
|
* Fix up Web IDE user preference copy and buttonsJose Ivan Vargas2018-01-111-1/+1
|
* Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-091-0/+8
|\ | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
| * Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-091-0/+8
| | | | | | | | Closes #41561
* | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-091-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
| * | Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally branch 'mk-toggle-writing-to-auth-keys-1631' See merge request !2004 Squashed commits: Add authorized_keys_enabled to Application Settings Ensure default settings are exposed in UI Without this change, `authorized_keys_enabled` is unchecked when it is nil, even if it should be checked by default. Add “Speed up SSH operations” documentation Clarify the reasons for disabling writes Add "How to go back" section Tweak copy Update Application Setting screenshot
* | | Merge branch '38056-remove-unused-option' into 'master'Phil Hughes2018-01-081-1/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Remove unused push_code_to_protected_branches Closes #38056 See merge request gitlab-org/gitlab-ce!16253
| * | Remove unused push_code_to_protected_branches38056-remove-unused-optionLin Jen-Shin2018-01-051-1/+0
| |/
* | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-0/+8
|/
* Merge branch 'jramsay-41590-add-readme-case' into 'master'Douwe Maan2018-01-041-1/+1
|\ | | | | | | | | | | | | Remove downcase from special path helper Closes #41590 See merge request gitlab-org/gitlab-ce!16232
| * Remove downcase from special path helperJames Ramsay2018-01-041-1/+1
| |
* | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-041-0/+11
| |
* | Multi File Editor File iconsTim Zallmann2018-01-031-0/+7
|/
* Merge branch 'jivl-general-icons-2' into 'master'Tim Zallmann2017-12-222-2/+2
|\ | | | | | | | | Replace the download, fork and resolve discussion in a new issue icons See merge request gitlab-org/gitlab-ce!15436
| * Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-191-1/+1
| |
| * replaced download icon for the sprite based oneJose Ivan Vargas2017-12-191-1/+1
| |
* | Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-212-4/+41
| |
* | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-211-2/+8
|\ \ | | | | | | | | | | | | | | | | | | Enables ordering groups and their children by name in the web interface Closes #24962 et #36958 See merge request gitlab-org/gitlab-ce!16045
| * | Enable sorting by name in the Groups dropdownMark Fletcher2017-12-201-0/+2
| | |
| * | Employ Groups dropdown in admin viewMark Fletcher2017-12-201-2/+6
| |/
* | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-193-3/+3
|/
* Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-191-0/+5
|\ | | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
| * Hardcode clusters helper in CEMatija Čupić2017-12-181-1/+1
| |
| * Use helper for feature check in cluster partialsMatija Čupić2017-12-181-0/+5
| |
* | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
| * | Address some comments with running a pipeline scheduleStan Hu2017-12-121-2/+2
| | |
| * | Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-0/+5
| | | | | | | | | | | | Closes #38741
* | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
| * | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-2/+2
| | | | | | | | | | | | requests
* | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-1/+1
| |/ |/| | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* | Merge branch ↵Robert Speicher2017-12-121-7/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * | Refactor member view by using presenterTM Lee2017-12-111-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_versionSean McGivern2017-12-121-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Hide issues and MRs in labels list if disabled See merge request gitlab-org/gitlab-ce!15863
| * | | Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15Sophie Herold2017-12-111-0/+7
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-122-9/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use app host instead of asset host when rendering image blob or diff Closes #41002 See merge request gitlab-org/gitlab-ce!15854
View Lorry Controller Status