summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update database_mysql.md to remove conflicting recommendationlm-update-mysql-recLee Matos2018-02-131-1/+0
* Merge branch 'remove-unused-code-profile' into 'master'Jacob Schatz2018-02-131-18/+0
|\
| * Remove unused coderemove-unused-code-profileClement Ho2018-02-081-18/+0
* | Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-133-24/+5
|\ \
| * | Revert problematic LDAP person validation that threw exceptionsDrew Blessing2018-02-133-24/+5
* | | Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-133-22/+3
|\ \ \
| * | | Remove Sentry reporting for query limitingYorick Peterse2018-02-133-22/+3
* | | | Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' i...Phil Hughes2018-02-133-1/+35
|\ \ \ \
| * | | | Fix settings panel not expanding when fragment hash linkedEric Eastwood2018-02-133-1/+35
* | | | | Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ...Kamil Trzciński2018-02-131-1/+2
|\ \ \ \ \
| * | | | | Properly format values.yaml for deployed Ingresses43189-deployed-ingress-configmap-does-not-enable-metricsJoshua Lambert2018-02-121-1/+2
* | | | | | Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master'Robert Speicher2018-02-135-49/+79
|\ \ \ \ \ \
| * | | | | | Port some RuboCop and doc changes from EERémy Coutable2018-02-133-6/+33
| * | | | | | Port spec/fixtures/api/schemas/deployment.json from EERémy Coutable2018-02-132-43/+46
* | | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-network-graph' into 'master'Robert Speicher2018-02-131-5/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graphAhmad Sherif2018-02-131-5/+2
* | | | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-delete-merged-branches-service' ...Robert Speicher2018-02-131-11/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-serviceAhmad Sherif2018-02-121-11/+7
* | | | | | | | | Merge branch '42580-fix-lock-mr-hover-on-edit' into 'master'Phil Hughes2018-02-132-3/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make Edit link style consistent on Sidebar42580-fix-lock-mr-hover-on-editAndré Luís2018-02-132-3/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'document-all-queues-yml' into 'master'Kamil Trzciński2018-02-131-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update sidekiq_style_guide.mddocument-all-queues-ymlDylan Griffith2018-02-131-2/+2
| * | | | | | | | | Document all_queues.yml in sidekiq_style_guide.mdDylan Griffith2018-02-131-0/+3
* | | | | | | | | | Merge branch '26466-natural-sort-mrs' into 'master'Sean McGivern2018-02-134-2/+52
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Change issue show page to group MRs by projects and namespacesJeff Stubler2018-02-134-2/+52
* | | | | | | | | | Merge branch 'qa/mk-fix-artifact-creation' into 'master'Grzegorz Bizon2018-02-131-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix artifact creationqa/mk-fix-artifact-creationMichael Kozono2018-02-121-2/+2
* | | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-02-1316-2933/+17627
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2018-02-1316-2933/+17627
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-135-119/+118
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Dry up specmk-fix-no-untracked-upload-files-errorMichael Kozono2018-02-121-107/+29
| * | | | | | | | | | Add changelog entryMichael Kozono2018-02-121-0/+5
| * | | | | | | | | | Schedule PopulateUntrackedUploads if neededMichael Kozono2018-02-122-1/+48
| * | | | | | | | | | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-122-26/+27
| * | | | | | | | | | Fix last batch size equals max batch size errorMichael Kozono2018-02-122-1/+25
* | | | | | | | | | | Merge branch '42923-close-issue' into 'master'Phil Hughes2018-02-1315-49/+238
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-13132-10113/+339
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Reuse getter42923-close-issueFilipa Lacerda2018-02-126-21/+42
| * | | | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-1261-358/+918
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Put back class names used in shared testFilipa Lacerda2018-02-121-0/+2
| * | | | | | | | | | | Makes close/reopen issue request to inside the vue appFilipa Lacerda2018-02-0913-40/+206
* | | | | | | | | | | | Merge branch 'sh-no-cache-populate-migration' into 'master'Sean McGivern2018-02-134-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix a transient failure in db/post_migrate/20170717111152_cleanup_move_system...sh-no-cache-populate-migrationRémy Coutable2018-02-121-1/+1
| * | | | | | | | | | | | Use the latest migration in spec/migrations/rename_reserved_project_names_spe...Rémy Coutable2018-02-121-4/+8
| * | | | | | | | | | | | Allow to use the latest migration in migration specsRémy Coutable2018-02-121-1/+7
| * | | | | | | | | | | | Call .reset_column_in_all_models! before migrating in MigrationsHelpers.schem...Rémy Coutable2018-02-121-0/+2
| * | | | | | | | | | | | Use the :migration metadata in migration specsRémy Coutable2018-02-122-5/+6
| * | | | | | | | | | | | Disable caching of tables for migration spec that drops a temporary tableStan Hu2018-02-122-1/+5
* | | | | | | | | | | | | Merge branch 'sh-fix-issue-43193' into 'master'Sean McGivern2018-02-132-14/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193Stan Hu2018-02-122-14/+26
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |