summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix "Confidential comments" button not saving in project hookssh-fix-confidential-note-optionStan Hu2018-08-171-0/+1
| | | | Closes #50440
* Merge branch 'repopulate_site_statistics' into 'master'Yorick Peterse2018-08-171-1/+1
|\ | | | | | | | | Fix SiteStatistics wikis_count See merge request gitlab-org/gitlab-ce!21030
| * Refactor SiteStatistics to extract refresh logic into a rake taskGabriel Mazetto2018-08-161-14/+0
| |
| * Added method to re-populating SiteStatitiscs counterGabriel Mazetto2018-08-161-1/+15
| |
* | Merge branch '50101-builds-dropdown' into 'master'Phil Hughes2018-08-172-0/+157
|\ \ | | | | | | | | | | | | Creates vue components for stage dropdowns and job list container for job log view See merge request gitlab-org/gitlab-ce!21255
| * | Creates vue components for stage dropdowns and job list container for job ↵Filipa Lacerda2018-08-172-0/+157
| | | | | | | | | | | | log view
* | | Fix: Project deletion may not log audit events during user deletionValery Sizov2018-08-172-6/+4
| | |
* | | Merge branch 'ide-live-preview-merge-requests' into 'master'Filipa Lacerda2018-08-172-3/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fixed Web IDE live preview crashing when loading from merge request Closes #50392 See merge request gitlab-org/gitlab-ce!21252
| * | Fixed Web IDE live preview crashing when loading from merge requestPhil Hughes2018-08-162-3/+5
| | |
* | | Merge branch 'mg-keep-project-settings-expanded' into 'master'Filipa Lacerda2018-08-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix mirror settings anchor See merge request gitlab-org/gitlab-ce!21261
| * | | port of EE changesmg-keep-project-settings-expandedMike Greiling2018-08-161-1/+1
| | |/ | |/|
* | | Merge branch '50101-commit-block' into 'master'Phil Hughes2018-08-171-0/+64
|\ \ \ | | | | | | | | | | | | | | | | Creates Vue component for commit block in job log view See merge request gitlab-org/gitlab-ce!21249
| * | | Creates Vue commit component for job log page50101-commit-blockFilipa Lacerda2018-08-161-0/+64
| | | |
* | | | Merge branch '50101-trigger' into 'master'Phil Hughes2018-08-171-0/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Creates Vue component for trigger variables block in job log page See merge request gitlab-org/gitlab-ce!21244
| * | | | Creates Vue component for trigger variables block in job log page50101-triggerFilipa Lacerda2018-08-161-0/+84
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate pot files Remove `#` Remove empty lines
* | | | doc: ci/yaml expire_in: the value is in secondsElan Ruusamäe2018-08-171-0/+2
| | | |
* | | | Fix 1px cutoff of emojisgfyoung2018-08-161-3/+0
| | | |
* | | | Frontend: Proper gettext extraction with gettext-extractor🌴🇿🇦 Lukas Eipert (OOO until Summit)2018-08-165-13/+40
| |/ / |/| |
* | | Merge branch ↵Mike Greiling2018-08-163-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable' into 'master' Resolve "Instance Statistics: ConvDev index intro banner is not dismissable" Closes #50312 See merge request gitlab-org/gitlab-ce!21211
| * | | Rename conv dev index show action to index action in js pages dirLuke Bennett2018-08-141-0/+0
| | | |
| * | | Move cohorts and conv dev index js to new pages locationLuke Bennett2018-08-143-0/+0
| | | |
* | | | Merge branch '49770-fixes-input-alignment-on-user-admin-form-with-errors' ↵Fatih Acet2018-08-162-15/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Admin > New user form > Error state > Inputs misaligned" Closes #49770 See merge request gitlab-org/gitlab-ce!21108
| * | | | Fixes input alignment in user admin form with errors49770-fixes-input-alignment-on-user-admin-form-with-errorsJacopo2018-08-092-15/+30
| | | | |
* | | | | Merge branch 'zj-remove-repository-languages-feature-gate' into 'master'Nick Thomas2018-08-162-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature gates for Repository Languages Closes #50291 See merge request gitlab-org/gitlab-ce!21186
| * | | | | Remove feature gates for Repository LanguagesZeger-Jan van de Weg2018-08-162-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository languages feature got introduced through: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19480. This MR included feature flags to guard against performance regressions, which allowed GitLab to test it on gitlab.com before the customers would be exposed. .com worked out fine, as shown by our internal monitoring tools, which prompts feature gate removal. Given the docs weren't present yet, these were added too.
* | | | | | Merge branch ↵Nick Thomas2018-08-161-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49796-project-deletion-may-not-log-audit-events-during-group-deletion' into 'master' Resolve "Project deletion may not log audit events during group deletion" Closes #49796 See merge request gitlab-org/gitlab-ce!21162
| * | | | | | Fix: Project deletion may not log audit events during group deletion49796-project-deletion-may-not-log-audit-events-during-group-deletionValery Sizov2018-08-161-3/+4
| | | | | | |
* | | | | | | Fix if-checkDicker Max2018-08-161-1/+1
| | | | | | |
* | | | | | | Add rake command to migrate archived traces from local storage to object storageShinya Maeda2018-08-161-0/+5
| | | | | | |
* | | | | | | Instance statistics docsLuke Bennett2018-08-163-3/+3
| | | | | | |
* | | | | | | Creates a vue component for the top bar with controllers in job log viewFilipa Lacerda2018-08-161-0/+139
| | | | | | |
* | | | | | | Resolve "Enable Auto DevOps instance-wide on GitLab.com"Dylan Griffith2018-08-163-9/+7
| |_|_|_|/ / |/| | | | |
* | | | | | Creates empty state component for job log viewFilipa Lacerda2018-08-161-0/+76
| | | | | |
* | | | | | Merge branch 'ide-job-top-bar-ui-polish' into 'master'Filipa Lacerda2018-08-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved padding of top bar in IDE job trace panel Closes #48059 See merge request gitlab-org/gitlab-ce!21222
| * | | | | | Improved padding of top bar in IDE job trace panelide-job-top-bar-ui-polishPhil Hughes2018-08-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #48059
* | | | | | | Merge branch 'ide-delete-new-files-state' into 'master'Filipa Lacerda2018-08-161-1/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed deleting new files creating wrong state in IDE Closes #50255 See merge request gitlab-org/gitlab-ce!21225
| * | | | | | Fixed deleting new files creating wrong state in IDEide-delete-new-files-statePhil Hughes2018-08-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #50255
* | | | | | | Added missing html_safe on text messages.Alexander Kutelev2018-08-161-2/+2
| | | | | | |
* | | | | | | Enable frozen in app/mailers/**/*.rbgfyoung2018-08-1518-12/+51
| | | | | | |
* | | | | | | Add Acceptance testing issue templateZeger-Jan van de Weg2018-08-151-1/+1
| | | | | | |
* | | | | | | Merge branch 'backport-5986-license-templates' into 'master'Robert Speicher2018-08-156-5/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212
| * | | | | | | Changes /admin/application_settings to support template repository selection ↵Nick Thomas2018-08-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in EE
| * | | | | | | Allow the project_select_tag to specify an initial value and for the ↵Nick Thomas2018-08-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection to be clear-able
| * | | | | | | Convert BlobHelper#licenses_for_select to use the new LicenseTemplateFinderNick Thomas2018-08-151-5/+7
| | | | | | | |
| * | | | | | | Introduce a LicenseTemplate model and LicenseTemplateFinder helperNick Thomas2018-08-152-0/+89
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'backport-author-link-style' into 'master'Phil Hughes2018-08-151-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Add author-link style from common.scss in EE See merge request gitlab-org/gitlab-ce!21204
| * | | | | | Add author-link style from common.scss in EEAnnabel Dunstone Gray2018-08-141-0/+4
| | | | | | |
* | | | | | | Merge branch 'port-i18n-for-mirrors-instructions' into 'master'Douwe Maan2018-08-151-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Port EE changes for mirrors/_instructions.html.haml See merge request gitlab-org/gitlab-ce!21107
| * | | | | | Merge branch 'master' into 'port-i18n-for-mirrors-instructions'Lin Jen-Shin2018-08-1086-135/+411
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/mirrors/_instructions.html.haml
| * | | | | | | Port EE changesLin Jen-Shin2018-08-091-7/+8
| | | | | | | |