summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add migration to cleanup internal_ids.ab-49446-internal-ids-inconsistencyAndreas Brandl2018-07-264-1/+189
* Merge branch '49631-fix-dangerfile-schema-rb' into 'master'Rémy Coutable2018-07-261-2/+2
|\
| * Fix regexp for detected `db/schema.rb` and `ee/db/geo/schema.rb`Thong Kuah2018-07-261-2/+2
* | Merge branch 'ce-5158-metrics-alerting' into 'master'Sean McGivern2018-07-2616-55/+141
|\ \
| * | Updates CE backportce-5158-metrics-alertingTiago Botelho2018-07-253-8/+12
| * | Move kubeclient and namespace variables to the private interfaceTiago Botelho2018-07-252-3/+3
| * | Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/me...Tiago Botelho2018-07-2516-54/+136
* | | Merge branch 'ide-edit-json-files' into 'master'Tim Zallmann2018-07-263-2/+24
|\ \ \
| * | | Fixed IDE not opening JSON filesPhil Hughes2018-07-263-2/+24
|/ / /
* | | Merge branch 'tz-move-repo-css' into 'master'Phil Hughes2018-07-263-0/+7
|\ \ \
| * | | Moved repo.css to its own CSS bundle to reduce the size of the main bundleTim Zallmann2018-07-263-0/+7
|/ / /
* | | Merge branch 'gitlab-qa-reset-local-store' into 'master'Rémy Coutable2018-07-261-0/+1
|\ \ \
| * | | Reset local storage between qa testsDJ Mountney2018-07-251-0/+1
* | | | Merge branch '31576-redirect-commits-to-root-if-no-ref' into 'master'Douwe Maan2018-07-264-3/+25
|\ \ \ \
| * | | | Remove before hook for specKia Mei Somabes2018-07-251-3/+1
| * | | | Transfer to commits_controller, add test, and update changelogKia Mei Somabes2018-07-245-9/+23
| * | | | Change hash syntax for redirect commits to root if no ref is providedKia Mei Somabes2018-07-231-1/+1
| * | | | Redirect commits to root_ref if no ref is providedKia Mei Somabes2018-07-203-0/+10
* | | | | Merge branch 'bvl-graphql-wip-mutation' into 'master'Douwe Maan2018-07-2623-15/+686
|\ \ \ \ \
| * | | | | Add mutation toggling WIP state of merge requestsBob Van Landuyt2018-07-2523-15/+686
* | | | | | Merge branch 'rs-danger-frozen_string' into 'master'Rémy Coutable2018-07-261-6/+5
|\ \ \ \ \ \
| * | | | | | Make the frozen_string Danger check more resilientRobert Speicher2018-07-251-6/+5
* | | | | | | Merge branch 'issue-boards-js-fix-backport' into 'master'Tim Zallmann2018-07-261-73/+76
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | CE backport of issue-boards-js-fixissue-boards-js-fix-backportPhil Hughes2018-07-251-73/+76
* | | | | | | Merge branch 'jivl-redesign-contributors-graph' into 'master'Clement Ho2018-07-257-19/+717
|\ \ \ \ \ \ \
| * | | | | | | Add bar chart componentjivl-redesign-contributors-graphJose2018-07-257-19/+717
| |/ / / / / /
* | | | | | | Merge branch '32783-api-all-members-with-ancestors' into 'master'Robert Speicher2018-07-255-36/+200
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Resolve "API endpoint that returns all members, including the inherited membe...🙈 jacopo beschi 🙉2018-07-255-36/+200
|/ / / / / /
* | | | | | Merge branch '49192-comment-alignment' into 'master'Clement Ho2018-07-251-0/+1
|\ \ \ \ \ \
| * | | | | | Fix alignment of code comment button49192-comment-alignmentAnnabel Dunstone Gray2018-07-201-0/+1
* | | | | | | Merge branch 'ch-gitlab-ui-progress-bar' into 'master'Tim Zallmann2018-07-259-56/+139
|\ \ \ \ \ \ \
| * | | | | | | Replace issues time tracking progress bar with gitlab-ui's progress barClement Ho2018-07-259-56/+139
|/ / / / / / /
* | | | | | | Move custom_wiki_sidebar changelog entry to the correct locationRobert Speicher2018-07-251-0/+0
* | | | | | | Merge branch '49364-fix-broadcast-margin' into 'master'Annabel Gray2018-07-252-1/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix broadcast message misalignment on login pageRobin Naundorf2018-07-242-1/+6
* | | | | | | Merge branch 'ce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-...Douglas Barbosa Alexandre2018-07-2512-1/+307
|\ \ \ \ \ \ \
| * | | | | | | Document site statistics APIce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slowGabriel Mazetto2018-07-241-0/+21
| * | | | | | | Apply pattern to make `find_or_create` atomicGabriel Mazetto2018-07-241-7/+10
| * | | | | | | Use activerecord migration version instead of rescuing for missing tablesGabriel Mazetto2018-07-241-10/+14
| * | | | | | | Added SiteStatistics as counter cache for Projects and WikisGabriel Mazetto2018-07-2411-1/+274
| * | | | | | | CHANGELOGGabriel Mazetto2018-07-241-0/+5
* | | | | | | | Merge branch 'issue47716-email_confirmations-squash' into 'master'Douwe Maan2018-07-253-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | fixes #47716 where email confirmation fails after adding additional emailsMuhammad Nuzaihan2018-07-253-0/+24
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-include-rbtrace' into 'master'Douwe Maan2018-07-256-0/+34
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add rbtrace to Gemfilesh-include-rbtraceStan Hu2018-07-256-0/+34
* | | | | | | | Merge branch '49582-enable-cops-for-db' into 'master'Rémy Coutable2018-07-25167-157/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable rubocop for db/**/* and ee/db/**/*49582-enable-cops-for-dbLin Jen-Shin2018-07-25167-157/+55
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'backport-reactive-caching' into 'master'Rémy Coutable2018-07-252-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport reactive cachingShinya Maeda2018-07-252-2/+15
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '49025-docs-kubernetes-tiller' into 'master'Marcia Ramos2018-07-252-7/+16
|\ \ \ \ \ \ \ \
View Lorry Controller Status