summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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 requestPhil Hughes2018-08-162-3/+5
* | Merge branch 'mg-keep-project-settings-expanded' into 'master'Filipa Lacerda2018-08-171-1/+1
|\ \
| * | 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 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 page50101-triggerFilipa Lacerda2018-08-161-0/+84
| |/ / /
* | | | 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 '50312-instance-statistics-convdev-index-intro-banner-is-not-dis...Mike Greiling2018-08-163-0/+0
|\ \ \
| * | | 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' int...Fatih Acet2018-08-162-15/+30
|\ \ \ \
| * | | | 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 LanguagesZeger-Jan van de Weg2018-08-162-4/+1
* | | | | | Merge branch '49796-project-deletion-may-not-log-audit-events-during-group-de...Nick Thomas2018-08-161-3/+4
|\ \ \ \ \ \
| * | | | | | 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 panelide-job-top-bar-ui-polishPhil Hughes2018-08-151-0/+1
* | | | | | | Merge branch 'ide-delete-new-files-state' into 'master'Filipa Lacerda2018-08-161-1/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixed deleting new files creating wrong state in IDEide-delete-new-files-statePhil Hughes2018-08-151-1/+6
* | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Changes /admin/application_settings to support template repository selection ...Nick Thomas2018-08-152-0/+4
| * | | | | | | Allow the project_select_tag to specify an initial value and for the selectio...Nick Thomas2018-08-151-0/+8
| * | | | | | | 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 EEAnnabel Dunstone Gray2018-08-141-0/+4
* | | | | | | Merge branch 'port-i18n-for-mirrors-instructions' into 'master'Douwe Maan2018-08-151-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'master' into 'port-i18n-for-mirrors-instructions'Lin Jen-Shin2018-08-1086-135/+411
| |\ \ \ \ \ \
| * | | | | | | Port EE changesLin Jen-Shin2018-08-091-7/+8
* | | | | | | | Merge branch 'add-user_show_add_ssh_key_message-application-setting' into 'ma...Nick Thomas2018-08-155-3/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Add ability suppress the global "You won't be able [use] SSH" messageÆvar Arnfjörð Bjarmason2018-08-085-3/+18
| |/ / / / / / /
* | | | | | | | Creates vue component for artifacts blockFilipa Lacerda2018-08-151-0/+98
* | | | | | | | Merge branch '50281-js-pages-do-not-load-on-windows-8-ie-11' into 'master'Tim Zallmann2018-08-151-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add polyfill for String.prototype.includesMike Greiling2018-08-151-0/+1
* | | | | | | | | Merge branch 'tz-mr-incremental-rendering' into 'master'Mike Greiling2018-08-156-8/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added compute property to diff file + changed a for loopTim Zallmann2018-08-142-2/+5
View Lorry Controller Status