Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Moves mr widget components into vue filesfl-mr-widget-4 | Filipa Lacerda | 2018-02-13 | 7 | -60/+86 |
* | Merge branch 'whitelisting' into 'master' | Yorick Peterse | 2018-02-13 | 3 | -22/+3 |
|\ | |||||
| * | Remove Sentry reporting for query limiting | Yorick Peterse | 2018-02-13 | 3 | -22/+3 |
* | | Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' i... | Phil Hughes | 2018-02-13 | 3 | -1/+35 |
|\ \ | |||||
| * | | Fix settings panel not expanding when fragment hash linked | Eric Eastwood | 2018-02-13 | 3 | -1/+35 |
* | | | Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ... | Kamil Trzciński | 2018-02-13 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Properly format values.yaml for deployed Ingresses43189-deployed-ingress-configmap-does-not-enable-metrics | Joshua Lambert | 2018-02-12 | 1 | -1/+2 |
* | | | | Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master' | Robert Speicher | 2018-02-13 | 5 | -49/+79 |
|\ \ \ \ | |||||
| * | | | | Port some RuboCop and doc changes from EE | Rémy Coutable | 2018-02-13 | 3 | -6/+33 |
| * | | | | Port spec/fixtures/api/schemas/deployment.json from EE | Rémy Coutable | 2018-02-13 | 2 | -43/+46 |
* | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-network-graph' into 'master' | Robert Speicher | 2018-02-13 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graph | Ahmad Sherif | 2018-02-13 | 1 | -5/+2 |
* | | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-delete-merged-branches-service' ... | Robert Speicher | 2018-02-13 | 1 | -11/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-service | Ahmad Sherif | 2018-02-12 | 1 | -11/+7 |
* | | | | | | | Merge branch '42580-fix-lock-mr-hover-on-edit' into 'master' | Phil Hughes | 2018-02-13 | 2 | -3/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make Edit link style consistent on Sidebar42580-fix-lock-mr-hover-on-edit | André Luís | 2018-02-13 | 2 | -3/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'document-all-queues-yml' into 'master' | Kamil Trzciński | 2018-02-13 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update sidekiq_style_guide.mddocument-all-queues-yml | Dylan Griffith | 2018-02-13 | 1 | -2/+2 |
| * | | | | | | | Document all_queues.yml in sidekiq_style_guide.md | Dylan Griffith | 2018-02-13 | 1 | -0/+3 |
* | | | | | | | | Merge branch '26466-natural-sort-mrs' into 'master' | Sean McGivern | 2018-02-13 | 4 | -2/+52 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Change issue show page to group MRs by projects and namespaces | Jeff Stubler | 2018-02-13 | 4 | -2/+52 |
* | | | | | | | | Merge branch 'qa/mk-fix-artifact-creation' into 'master' | Grzegorz Bizon | 2018-02-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix artifact creationqa/mk-fix-artifact-creation | Michael Kozono | 2018-02-12 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2018-02-13 | 16 | -2933/+17627 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2018-02-13 | 16 | -2933/+17627 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master' | Douwe Maan | 2018-02-13 | 5 | -119/+118 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Dry up specmk-fix-no-untracked-upload-files-error | Michael Kozono | 2018-02-12 | 1 | -107/+29 |
| * | | | | | | | | Add changelog entry | Michael Kozono | 2018-02-12 | 1 | -0/+5 |
| * | | | | | | | | Schedule PopulateUntrackedUploads if needed | Michael Kozono | 2018-02-12 | 2 | -1/+48 |
| * | | | | | | | | Fix orphan temp table untracked_files_for_uploads | Michael Kozono | 2018-02-12 | 2 | -26/+27 |
| * | | | | | | | | Fix last batch size equals max batch size error | Michael Kozono | 2018-02-12 | 2 | -1/+25 |
* | | | | | | | | | Merge branch '42923-close-issue' into 'master' | Phil Hughes | 2018-02-13 | 15 | -49/+238 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issue | Filipa Lacerda | 2018-02-13 | 132 | -10113/+339 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Reuse getter42923-close-issue | Filipa Lacerda | 2018-02-12 | 6 | -21/+42 |
| * | | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issue | Filipa Lacerda | 2018-02-12 | 61 | -358/+918 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Put back class names used in shared test | Filipa Lacerda | 2018-02-12 | 1 | -0/+2 |
| * | | | | | | | | | Makes close/reopen issue request to inside the vue app | Filipa Lacerda | 2018-02-09 | 13 | -40/+206 |
* | | | | | | | | | | Merge branch 'sh-no-cache-populate-migration' into 'master' | Sean McGivern | 2018-02-13 | 4 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix a transient failure in db/post_migrate/20170717111152_cleanup_move_system...sh-no-cache-populate-migration | Rémy Coutable | 2018-02-12 | 1 | -1/+1 |
| * | | | | | | | | | | Use the latest migration in spec/migrations/rename_reserved_project_names_spe... | Rémy Coutable | 2018-02-12 | 1 | -4/+8 |
| * | | | | | | | | | | Allow to use the latest migration in migration specs | Rémy Coutable | 2018-02-12 | 1 | -1/+7 |
| * | | | | | | | | | | Call .reset_column_in_all_models! before migrating in MigrationsHelpers.schem... | Rémy Coutable | 2018-02-12 | 1 | -0/+2 |
| * | | | | | | | | | | Use the :migration metadata in migration specs | Rémy Coutable | 2018-02-12 | 2 | -5/+6 |
| * | | | | | | | | | | Disable caching of tables for migration spec that drops a temporary table | Stan Hu | 2018-02-12 | 2 | -1/+5 |
* | | | | | | | | | | | Merge branch 'sh-fix-issue-43193' into 'master' | Sean McGivern | 2018-02-13 | 2 | -14/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193 | Stan Hu | 2018-02-12 | 2 | -14/+26 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'winh-new-branch-dropdown-style' into 'master' | Phil Hughes | 2018-02-13 | 10 | -139/+135 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-style | Winnie Hellmann | 2018-02-12 | 10 | -139/+135 |
* | | | | | | | | | | | Merge branch 'jivl-update-katex' into 'master' | Clement Ho | 2018-02-12 | 90 | -9702/+55 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Addressed mr observationsjivl-update-katex | Jose Ivan Vargas | 2018-02-12 | 4 | -19/+12 |