summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1332-64/+985
|\
| * Resolve "Bug: When creating an account with invalid characters the error is "...Jan2018-06-131-5/+4
| * Merge branch 'ide-commit-section-file-active-indicator' into 'master'Filipa Lacerda2018-06-135-5/+49
| |\
| | * moved strings into constants fileide-commit-section-file-active-indicatorPhil Hughes2018-06-134-5/+17
| | * more karma fixesPhil Hughes2018-06-123-4/+9
| | * karma updatesPhil Hughes2018-06-121-4/+4
| | * Add active class to active file in IDE commit panelPhil Hughes2018-06-114-2/+29
| * | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-131-1/+1
| |\ \
| | * | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-121-1/+1
| * | | Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-u...Sean McGivern2018-06-131-4/+13
| |\ \ \
| | * | | fixed condition checkJan Provaznik2018-06-131-1/+1
| | * | | Override exclusive_lease_key method in RecordsUpload47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploadersJan Provaznik2018-06-121-6/+10
| | * | | Use upload ID instead of model ID in lease keyJan Provaznik2018-06-121-4/+9
| * | | | Image Diff Viewing + Download Diff ViewingTim Zallmann2018-06-1317-31/+876
| * | | | Merge branch 'qa-271' into 'master'Rémy Coutable2018-06-135-8/+8
| |\ \ \ \
| | * | | | Ensure we look into the correct setion only when expanding a settings' sectionRémy Coutable2018-06-135-8/+8
| * | | | | Typo fixRoss Laird2018-06-131-1/+1
| * | | | | Merge branch 'rails5-fix-47366' into 'master'Rémy Coutable2018-06-131-0/+5
| |\ \ \ \ \
| | * | | | | Rails5 fix expected `issuable.reload.updated_at` to have changedJasper Maes2018-06-131-0/+5
| | |/ / / /
| * | | | | Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' i...Sean McGivern2018-06-133-9/+28
| |\ \ \ \ \
| | * | | | | apply feedback47408-migrateuploadsworker-is-doing-n-1-queries-on-migrationMicaël Bergeron2018-06-121-1/+2
| | * | | | | apply feedbackMicaël Bergeron2018-06-081-2/+11
| | * | | | | fix the failing specMicaël Bergeron2018-06-071-1/+2
| | * | | | | shave off another 20% queryMicaël Bergeron2018-06-072-4/+5
| | * | | | | shave off 30% of the query countMicaël Bergeron2018-06-062-5/+12
* | | | | | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vueFilipa Lacerda2018-06-131-2/+1
* | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1340-786/+684
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '42342-teams-pipeline-notifications' into 'master'Douwe Maan2018-06-133-6/+7
| |\ \ \ \ \ \
| | * | | | | | Fixes Microsoft Teams notifications for pipeline eventsJeff Brown2018-06-123-6/+7
| * | | | | | | Resolve "Use one column form layout on Admin Area Settings page"Dennis Tang | OOO until 18.062018-06-1329-769/+658
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '46702-groups-members-no-padding-between-dropdowns-input' into '...Annabel Gray2018-06-133-10/+8
| |\ \ \ \ \ \
| | * | | | | | Fix group member filter layout46702-groups-members-no-padding-between-dropdowns-inputClement Ho2018-06-123-10/+8
| * | | | | | | Resolve "Participants tooltip is cutoff when too close to the window edge"Clement Ho2018-06-121-0/+1
| |/ / / / / /
| * | | | | | Merge branch '47773-search-bar' into 'master'Clement Ho2018-06-121-0/+2
| |\ \ \ \ \ \
| | * | | | | | Align nav bar itemsAnnabel Dunstone Gray2018-06-121-0/+2
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch '47265-inputs-labels-alignment' into 'master'Clement Ho2018-06-121-0/+1
| |\ \ \ \ \ \
| | * | | | | | Remove top padding from .col-form-label47265-inputs-labels-alignmentAnnabel Dunstone Gray2018-06-111-0/+1
| * | | | | | | Fix labels too largeLuke Bennett2018-06-121-1/+5
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-121-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-121-0/+1
* | | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-122-5/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-121-4/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Find and mark more Git disk access locations, part 2Jacob Vosmaer2018-06-121-4/+5
| * | | | | | | | mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-2/+6
* | | | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1230-51/+106
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-129-9/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsisAndreas Kämmerle2018-06-119-9/+9
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'expose-ci-url' into 'master'Grzegorz Bizon | off until 20th June2018-06-122-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add CI_{PIPELINE,JOB}_URLexpose-ci-urlKamil Trzciński2018-06-122-1/+5
| * | | | | | | | | Merge branch 'unify-ci-variables-form-row' into 'master'Kamil Trzciński2018-06-121-0/+1
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status