summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* add feature flag for users searchAlexis Reigel2019-03-141-0/+2
|
* use project_search_tabs? for user search checkAlexis Reigel2019-03-142-1/+10
|
* Security Dashboard as default view for groupsGilbert Roulot2019-03-141-0/+1
| | | | | | | Add a supporting code to separate groups#show and groups#details which is required for the proper implementation of the Group Overview content and Security Dashboard option for it
* Enable/disable Auto DevOps at Group levelMayra Cabrera2019-03-121-0/+13
| | | | | | | | | | | | - Includes instance methods on Group model to detect when a group has AutoDevOps explicitly/implicitly enabled/disabled. - Includes migration to add a new column to namespaces table - Add UI necessary modifications - Add service and controller to update auto devops related instances - Updates project and groups auto devops badges Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52447
* Remove old code in TreeHelper#flatten_treeStan Hu2019-03-071-10/+1
|
* Adds the Rubocop ReturnNil copAndrew Newdigate2019-03-063-5/+5
| | | | | This style change enforces `return if ...` instead of `return nil if ...` to save maintainers a few minor review points
* Merge branch '58023-add-Saturday-to-localization-first-day-of-the-week' into ↵Clement Ho2019-03-061-1/+2
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Add Saturday to Localization first day of the week" Closes #58023 See merge request gitlab-org/gitlab-ce!25509
| * Add Saturday to first day of the weekhaghighi_ahmad2019-03-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #58023 docs for adding Saturday for first day of the week add related settings for Saturday as first day of the week firstDayOfWeek: Use enumeration, replace day's numbers with corresponding names make some variables lowercase (follow camelCase) add CHANGELOG entry Author: haghighi_ahmad <haghighi.ahmad@gmail.com> modified: app/assets/javascripts/pages/users/activity_calendar.js modified: app/helpers/preferences_helper.rb new file: changelogs/unreleased/58023-add-Saturday-to-localization-first-day-of-the-week.yml modified: doc/api/settings.md modified: doc/user/profile/preferences.md modified: locale/gitlab.pot modified: spec/helpers/preferences_helper_spec.rb
* | Merge branch ↵Grzegorz Bizon2019-03-051-17/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '45305-ci-status-icon-mismatch-on-merge-requests-page-and-the-mr-itself' into 'master' Resolve "CI status icon mismatch on Merge Requests page and the MR itself" Closes #45305 See merge request gitlab-org/gitlab-ce!25407
| * | Adding ability to pass in path to status iconScott Hampton2019-02-261-0/+26
| | | | | | | | | | | | Project passed a very specific details path. Also reverted a change.
| * | Removed other deprecated status helpersScott Hampton2019-02-261-37/+0
| | | | | | | | | | | | Updating a couple other places that were still using deprecated status.
| * | Remove deprecated ci status helper functionScott Hampton2019-02-201-6/+0
| | | | | | | | | | | | After changing all places that used the function, we can now remove it.
* | | Merge branch 'ce-billings-gold-trial-callout' into 'master'Sean McGivern2019-03-041-0/+3
|\ \ \ | |_|/ |/| | | | | | | | CE BE Prep backend for /billings gold trial callouts See merge request gitlab-org/gitlab-ce!25482
| * | Prep backend for /billings gold trial calloutsLuke Bennett2019-03-011-0/+3
| | | | | | | | | | | | Ports GoldTrialUserCallouts to CE.
* | | Merge branch '57829-issuable-meta-line-ui-broken-on-mobile' into 'master'Clement Ho2019-03-041-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix UI for issuable meta info Closes #57829 See merge request gitlab-org/gitlab-ce!25332
| * | Fix author layouts in issuable meta line UIs on mobileTakuya Noguchi2019-02-181-1/+1
| |/ | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Refactor model and specReuben Pereira2019-03-011-0/+14
| | | | | | | | | | | | - Move some specs into contexts - Let get_slugs method take a parameter and return a specific slug. - Add rescues when using Addressable::URI.
* | Merge branch '56863-system-messages-in-email' into 'master'Douglas Barbosa Alexandre2019-02-282-3/+43
|\ \ | | | | | | | | | | | | | | | | | | Show header and footer system messages in email Closes #56863 See merge request gitlab-org/gitlab-ce!25474
| * | Show header and footer system messages in emailAlexandru Croitor2019-02-272-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add email_header_and_footer_enabled flag to appearances table * Set email_header_and_footer_enabled default value to false * Add checkbox to appearance to toggle show header and footer in emails * Add email_header_and_footer_enabled to allowed params in controller * Add header and footer messages to the html and text email layouts * Remove the color styling for emails header and footer * Add empty_mailer layout for emails without layout, to have the header and footer applied
* | | Use Web IDE path for merge request edit buttonsPhil Hughes2019-02-271-1/+1
|/ /
* | Merge branch 'web-ide-default-editor' into 'master'Filipa Lacerda2019-02-271-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Makes the Web IDE the default editor Closes #42382 See merge request gitlab-org/gitlab-ce!25171
| * | Makes the Web IDE the default editorPhil Hughes2019-02-261-1/+2
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42382
* | | Merge branch 'fix-misspellings-app-comments' into 'master'Rémy Coutable2019-02-261-1/+1
|/ / | | | | | | | | Fix misspellings in app/spec comments See merge request gitlab-org/gitlab-ce!25517
* | Revert "Merge branch 'fix-misspellings-app-comments' into 'master'"Michael Kozono2019-02-251-1/+1
| | | | | | | | | | This reverts commit 9202bbd129537a698b986e6295d0c783b5a84815, reversing changes made to 4b282e9ce1ae246c4538b3ede18d1380ea778029.
* | Fix misspellings in app/spec commentsTakuya Noguchi2019-02-251-1/+1
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch '55057-system-message-to-core' into 'master'Sean McGivern2019-02-222-2/+47
|\ \ | | | | | | | | | | | | | | | | | | Port EE System Header And Footer feature to CE Closes #55057 See merge request gitlab-org/gitlab-ce!25241
| * | Port EE System Header And Footer feature to CEDouwe Maan2019-02-212-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | remove EE specific code remove EE licence checks move migration from EE to CE folder structure move specs from EE to CE folder structure remove EE specific flag specs
* | | Sort labels alphabeticallyDmitriy Zaporozhets2019-02-211-0/+4
|/ / | | | | | | | | | | | | | | Sorts labels alphabetically on issues (and merge requests) list. Before it was order id desc. Now it will be consistent with sidebar and labels page. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move language setting to preferencesFabian Schneider2019-02-201-0/+4
| |
* | fix #39010 - add left margin to 1st time contributor badgeGokhan Apaydin2019-02-201-1/+1
|/
* Improve the GitHub and Gitea import feature table interfaceimport-go-to-project-cta-nibble-frontendLuke Bennett2019-02-131-12/+0
| | | | | | | | | | | These are frontend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
* Improve the GitHub and Gitea import feature table interfaceLuke Bennett2019-02-132-27/+3
| | | | | | | | | | | These are backend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
* Replace useless divs with flex layout in navbarjoola2019-02-121-1/+1
| | | | Notable changes proposed by @pslaughter
* Move permission check of manual actions of deploymentsShinya Maeda2019-02-081-1/+0
|
* Merge branch 'master' into ↵Sean McGivern2019-02-072-38/+2
|\ | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'Grzegorz Bizon2019-02-071-37/+0
| |\ | | | | | | | | | | | | | | | | | | Moves domain setting to Clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24580
| | * Addresses UX and BE comments:52363-ui-changes-to-cluster-and-ado-pagesMayra Cabrera2019-02-061-26/+0
| | | | | | | | | | | | | | | | | | - Changes help text on clusters form to make it more explicit. - Removes unnecessary warnings on auto devops form - Simplifies cluster methods logic
| | * Moves domain setting to Cluster settingMayra Cabrera2019-02-041-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes domain field to be on the Cluster page show, removing it from Auto DevOps setting. Also injects the new environment variable KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables. Migration to move the information from ProjectAutoDevops#domain to Clusters::Cluster#domain. As well as necessary modifications to qa selectors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
| * | Merge branch 'local-markdown-version' into 'master'Douglas Barbosa Alexandre2019-02-071-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add local markdown version Closes #32789 See merge request gitlab-org/gitlab-ce!24822
| | * | Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
* | | | Add tests for preferences_helperFabian Schneider2019-02-061-4/+4
| | | |
* | | | Rename setting, fix wordingsFabian Schneider2019-02-062-3/+3
| | | |
* | | | Add helpers for first day of the weekFabian Schneider2019-02-061-7/+10
| | | |
* | | | Add default setting for first day of the week preferenceFabian Schneider2019-02-061-0/+5
| | | |
* | | | Add setting for first day of the weekFabian Schneider2019-02-062-0/+8
|/ / /
* | | Merge branch ↵Filipa Lacerda2019-02-062-1/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43681-display-last-activity-and-created-at-datetimes-for-users-in-admin-users' into 'master' Resolve "Display last activity and created at datetimes for users" Closes #43681 See merge request gitlab-org/gitlab-ce!24181
| * | | Add last activity to user administrationBrandon Labuschagne2019-02-052-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The columns 'Created on' and 'Last activity' have been added to the admin -> users view. Sorting options have also been added for last activity and the search bar has been moved to match the issues page.
* | | | Resolve "Empty states for profile page"Dennis Tang2019-02-061-0/+4
| |/ / |/| |
* | | Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-054-12/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove Redcarpet markdown engine Closes #51374 See merge request gitlab-org/gitlab-ce!24819
| * | Remove Redcarpet markdown engineJan Provaznik2019-02-044-12/+0
| |/ | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
View Lorry Controller Status