summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-unused-code-issueshelper' into 'master'Rémy Coutable2017-09-042-35/+0
|\ | | | | | | | | Remove unused methods from `IssuesHelper` and `IssuablesHelper` See merge request !13793
| * Remove unused `IssuesHelper#merge_requests_sentence`Mehdi Lahmam2017-08-241-8/+0
| | | | | | | | Its last usage has been removed at eb3e7bdfd8.
| * Removed unused `IssuablesHelper#issuable_state_scope`Mehdi Lahmam2017-08-241-8/+0
| | | | | | | | Its last usage has been removed at 260c8da060.
| * Remove unused `IssuesHelper#due_date_options`Mehdi Lahmam2017-08-241-12/+0
| | | | | | | | Its last usage has been removed at 05523b5bd1.
| * Remove unused `IssuesHelper#bulk_update_milestone_options`Mehdi Lahmam2017-08-241-7/+0
| | | | | | | | Its last usage has been removed at 2e3c082f2a.
* | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-032-4/+6
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
* | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-024-9/+17
|\ \ | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069
| * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-314-1/+8
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-311-0/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-308-16/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-232-5/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json
| * | | | | | Misc tweaksDouwe Maan2017-08-171-4/+4
| | | | | | |
| * | | | | | Rename a few attribute suffixes from `_url` to `_path`Douwe Maan2017-08-171-3/+3
| | | | | | |
| * | | | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-179-21/+59
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
| * \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-122-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance Better categorize test coverage results Add option to disable project export on instance - db changes Better caching and indexing of broadcast messages Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Document rspec-retry and rspec-flaky Fix cop description Retrieve and sync flaky specs report from and to S3 Use a new RspecFlakyListener to detect flaky specs Fix formatting of patch_versions.md [skip ci] Enable Timecop safe mode Show error message for API 500 error in tests, and Fix merge request diff deserialisation when too_large was absent Delete correct key from `session` after authenticating using U2F Bumps omniauth-ldap gem version to 2.0.4 Pending delete projects no longer return 500 error in Admins projects view Do not run the `ee_compat_check` job for stableish branches Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. ...
| * | | | | | | | Fix failing static-analysis (rubocop)Jarka Kadlecova2017-08-111-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-103-6/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (42 commits) alternative route for download archive Add missing command to compile GetText files Prevent user from changing username with container registry tags Rename RPC 'Exists' to 'RepositoryExists' Fix the sticky changes bar on commits page Fix ee_compat_check when EE branch uses a prefix Removed display styles when hiding the fly out navigation Explain why we use select all for project_url_constrainer.rb Fix pikaday being undefined Add a helper to stub storage settings with defaults Enable the Layout/SpaceBeforeBlockBraces cop update Install from Source instructions Translations can be picked without asking for exceptions Ask for exceptions in advance Don't require stackprof in Gemfile Synchronous Korean translation in zanata Use full path of user's avatar in webhooks Update icon color on hover Align all nav items in sidebar Fix height of collapsed sidebar items ...
| * \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-0812-30/+110
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (481 commits) Make sure that we have author and committer disable file upload button while uploading Fix bar chart does not display label at hour 0 Fixed activity not loading on project homepage Expose noteable_iid in Note Fix fly-out width when it has long items Add a test to show that threshold 40 would corrupt Add changelog entry Raise encoding confidence threshold to 50 Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/` Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/` Add Italian translations of Pipeline Schedules Restrict InlineJavaScript for haml_lint to dev and test environment Incorporate Gitaly's CommitService.FindCommit RPC Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit fix repo_edit_button_spec.js fix test failures in repo_preview_spec.js fix repo_loading_file_spec tests Refactor Gitlab::Git::Commit to include a repository use 100vh instead of flip flopping between the two - works on all suported browsers ...
| * | | | | | | | | | Convert ?full_data=1 -> ?view=full_dataSean McGivern2017-08-071-3/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-043-4/+36
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (162 commits) Since mysql is not a priority anymore, test it less Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Install yarn via apt in update guides Use long curl options Remove monkey-patched Array.prototype.first() and last() methods Openshift Getting Started 35659 Rename Pipelines tab to CI / CD in new navigation Don't bother going through an entire Banzai pipeline for empty text Add active state for pipelines settings on old nav Bump rspec to 3.6.0 Resolve "Specific Async Script Loading by using a Page Variable" Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'" another rubocop style fix Use mixin for new dropdown style Migrate Repository#last_commit_for_path to Gitaly Migrate blame loading to Gitaly ...
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-015-16/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Add code review guidelines related to Build [CI skip]. Make time span dropdown style on cycle analytics page consistent Add 204. Remove duplicated method. Make sure we didn't commit conflicts Fix bug in blob test Always fetch branches before finding the merge base, otherwise we could find an outdated merge base Fixes dropdown margin in sidebar Docs add blog articles Inline script cleanup globals and easy Add option to use CommitLanguages RPC CI fixes for gitaly-ruby fix Allow logged in users to read user list under public restriction Small refactor in LegacyNamespace and moved back send_update_instructions Rename ensure_dir_exist -> ensure_storage_path_exist Added some extra TODOs for the Legacy Storage refactor Make disk_path keyword argument and optional Rename more path_with_namespace -> full_path or disk_path Rename path_with_namespace -> disk_path when dealing with the filesystem Rename many path_with_namespace -> full_path ...
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-3112-17/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/concerns/notes_actions.rb # spec/features/task_lists_spec.rb # spec/support/features/issuable_slash_commands_shared_examples.rb
| * | | | | | | | | | | | | [ci skip] Emit events up to prevent accessing refs of refsFilipa Lacerda2017-07-281-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | [ci skip] Adds quick actions links to the toolbarFilipa Lacerda2017-07-261-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add data required for note formDouwe Maan2017-07-211-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add full JSON endpoints for issue notes and discussionsDouwe Maan2017-07-212-2/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Ensure `issuables_count_for_state` returns the requested state countRobert Speicher2017-09-011-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '17849-allow-admin-to-restrict-min-key-length-and-techno' into ↵Robert Speicher2017-09-012-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add settings for minimum key strength and allowed key type Closes #17849 See merge request !13712
| * | | | | | | | | | | | | | More review commentsNick Thomas2017-08-301-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Address review commentsNick Thomas2017-08-301-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Rework the permissions model for SSH key restrictionsNick Thomas2017-08-301-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `allowed_key_types` is removed and the `minimum_<type>_bits` fields are renamed to `<tech>_key_restriction`. A special sentinel value (`-1`) signifies that the key type is disabled. This also feeds through to the UI - checkboxes per key type are out, inline selection of "forbidden" and "allowed" (i.e., no restrictions) are in. As with the previous model, unknown key types are disallowed, even if the underlying ssh daemon happens to support them. The defaults have also been changed from the lowest known bit size to "no restriction". So if someone does happen to have a 768-bit RSA key, it will continue to work on upgrade, at least until the administrator restricts them.
| * | | | | | | | | | | | | | Warn users when their keys are invalidNick Thomas2017-08-301-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add settings for minimum key strength and allowed key typeNick Thomas2017-08-301-0/+18
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an amalgamation of: * Cory Hinshaw: Initial implementation !5552 * Rémy Coutable: Updates !9350 * Nick Thomas: Resolve conflicts and add ED25519 support !13712
* | | | | | | | | | | | | | Merge branch 'remove-finder-caching' into 'master'Robert Speicher2017-09-011-10/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove issuable finder count caching See merge request !13959
| * | | | | | | | | | | | | | Remove issuable finder count cachingSean McGivern2017-08-311-10/+3
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to cache the total open count separately, and then just perform these counts on the list. We already do that to get the pagination information, through Kaminari, and a future change will make Kaminari reuse the query results from earlier in the request.
* | | | | | | | | | | | | | Merge branch 'enable-new-navigaton-by-default' into 'master'Tim Zallmann2017-09-013-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the new navigation by default See merge request !13387
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-defaultPhil Hughes2017-08-304-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | more spec fixesPhil Hughes2017-08-292-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Enable the new navigation by defaultPhil Hughes2017-08-291-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch ↵Tim Zallmann2017-08-312-18/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| * | | | | | | | | | | | | | fix variable naming conflict31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-publicMike Greiling2017-08-301-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix error reported by FlayRubén Dávila2017-08-301-8/+16
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | enhance disabled group visibility options with links and instructionsMike Greiling2017-08-301-2/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add links and instructions to disabled visibility option help textMike Greiling2017-08-301-2/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add notes to the disabled visibility setting string helper to ensure changes ↵Mike Greiling2017-08-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are reflected in the model as well
| * | | | | | | | | | | | | | revert changes to visibility level helpers from 6f03ddcMike Greiling2017-08-301-5/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add check for access to NamespaceRubén Dávila2017-08-301-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Address some suggestions from first code reviewRubén Dávila2017-08-292-14/+13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | expand the help text with links and additional instructionsMike Greiling2017-08-261-1/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | dynamically disable/enable visibility options when changing namespaces in ↵Mike Greiling2017-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new project form