summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove a redundant `InvalidPathError` definitionrs-remove-useless-definitionRobert Speicher2017-12-201-5/+0
* Merge branch 'jivl-replace-d3-v3-v4' into 'master'Mike Greiling2017-12-2012-76/+226
|\
| * added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4Jose Ivan Vargas2017-12-183-8/+4
| * Removed fills from stat_contributors_graphJose Ivan Vargas2017-12-181-3/+0
| * cleaned up date_time_formattersJose Ivan Vargas2017-12-181-17/+8
| * Restored the timeScaleFormat for the prometheus dashboardJose Ivan Vargas2017-12-182-6/+41
| * Refactored d3 modules to instead of having a common_d3 dir, to use the micro ...Jose Ivan Vargas2017-12-189-131/+81
| * corrected functionality from the stat_contributors_graphJose Ivan Vargas2017-12-183-10/+25
| * fixed specs and the non-rendering stat_graph_contributors_graphJose Ivan Vargas2017-12-183-8/+7
| * optimized d3 v4 with a custom made bundleJose Ivan Vargas2017-12-1810-151/+74
| * Modified contributors graph to use d3 v4Jose Ivan Vargas2017-12-183-28/+46
| * Update d3 to v4 and migrated the prometheus dashboardJose Ivan Vargas2017-12-185-47/+273
* | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docsRobert Speicher2017-12-205-35/+16
|\ \
| * | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-205-35/+16
* | | Merge branch 'zj-empty-repo-importer' into 'master'Stan Hu2017-12-203-5/+10
|\ \ \ | |/ / |/| |
| * | Migrate to Project#empty_repo?zj-empty-repo-importerZeger-Jan van de Weg2017-12-203-5/+10
|/ /
* | Merge branch 'layout-nav-es-module' into 'master'Filipa Lacerda2017-12-202-42/+33
|\ \
| * \ Merge branch 'master' into layout-nav-es-modulelayout-nav-es-moduleFilipa Lacerda2017-12-2061-212/+594
| |\ \
| * | | Changed layout_nav to ES modulePhil Hughes2017-12-192-42/+33
* | | | Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable2017-12-205-2/+30
|\ \ \ \
| * | | | Add optional `search` param for Merge Requests APIMark Fletcher2017-12-204-0/+28
| * | | | Employ declared_params in finder methods for MR and Issue API listsMark Fletcher2017-12-202-2/+2
* | | | | Merge branch 'docs-qa-extend-how-to-run-specific-test' into 'master'Grzegorz Bizon2017-12-201-1/+8
|\ \ \ \ \
| * | | | | Specify how we're utilizing rspec heredocs-qa-extend-how-to-run-specific-testLin Jen-Shin2017-12-201-1/+8
| | |_|/ / | |/| | |
* | | | | Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when...Douwe Maan2017-12-208-67/+95
|\ \ \ \ \
| * | | | | Fork and Import jobs only get marked as failed when the number of Sidekiq ret...39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhaustedTiago Botelho2017-12-158-67/+95
* | | | | | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-2020-32/+66
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Call the correct method in the BlocksJsonSerialization specrs-blocks-json-serializationRobert Speicher2017-12-191-1/+1
| * | | | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-1911-25/+25
| * | | | | Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-192-4/+6
| * | | | | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-195-7/+6
| * | | | | Accept arguments to blocked JSON serialization methodsRobert Speicher2017-12-191-1/+1
| * | | | | Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-194-0/+33
| | |/ / / | |/| | |
* | | | | Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'Phil Hughes2017-12-206-55/+17
|\ \ \ \ \
| * | | | | Line up search dropdown with other nav dropdowns41186-sidebar-too-much-vertical-scrollAnnabel Dunstone Gray2017-12-192-8/+5
| * | | | | Remove transitionend event from GL dropdownPhil Hughes2017-12-191-16/+8
| * | | | | Remove block styling from search dropdownAnnabel Dunstone Gray2017-12-181-7/+0
| * | | | | Fix sidebar height when performance bar enabledAnnabel Dunstone Gray2017-12-182-0/+6
| * | | | | Remove all dropdown animations and set display: none if they're not openAnnabel Dunstone Gray2017-12-182-14/+2
| * | | | | Remove extra height declarations in CSS; remove block styling from dropdownsAnnabel Dunstone Gray2017-12-184-15/+1
* | | | | | Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'Douwe Maan2017-12-203-1/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-193-1/+27
* | | | | | Merge branch '41264-gitlab-projects-spec-failures' into 'master'Robert Speicher2017-12-193-10/+9
|\ \ \ \ \ \
| * | | | | | Prevent some specs from mangling the gitlab-shell checkoutNick Thomas2017-12-192-8/+5
| * | | | | | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov2017-12-191-2/+4
| |/ / / / /
* | | | | | Merge branch 'fix-onion-skin-reenter' into 'master'Jacob Schatz2017-12-193-13/+35
|\ \ \ \ \ \
| * | | | | | Fix onion-skin re-entering stateClement Ho2017-12-193-13/+35
|/ / / / / /
* | | | | | Merge branch 'remove-links-mr-empty-state' into 'master'Jacob Schatz2017-12-197-14/+84
|\ \ \ \ \ \
| * | | | | | Remove related links in MR widget when empty stateClement Ho2017-12-197-14/+84
|/ / / / / /
* | | | | | Merge branch 'show-inline-edit-btn' into 'master'Jacob Schatz2017-12-197-21/+10
|\ \ \ \ \ \
View Lorry Controller Status