summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use `force: true` for fetch_source_branchfix-rugged-fetch-source-branchAhmad Sherif2017-12-202-1/+16
* 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
|\ \ \ \
| * | | | Show inline edit button for issuesClement Ho2017-12-197-21/+10
|/ / / /
* | | | Merge branch '33028-event-tag-links' into 'master'Rémy Coutable2017-12-193-1/+62
|\ \ \ \
| * | | | Fix tags in the Activity tab not being clickableMario de la Ossa2017-12-193-1/+62
|/ / / /
* | | | Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-195-4/+81
|\ \ \ \
| * | | | BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-183-7/+14
| * | | | Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-185-4/+74
* | | | | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-1914-49/+184
|\ \ \ \ \
| * | | | | Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-1914-49/+184
* | | | | | Merge branch 'fix-docs-help-shortcut' into 'master'Phil Hughes2017-12-196-4/+53
|\ \ \ \ \ \
| * | | | | | Fix shortcut links on help pageClement Ho2017-12-196-4/+53
|/ / / / / /
* | | | | | Merge branch 'fl-update-axios-docs' into 'master'Phil Hughes2017-12-191-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fl-update-axios-docsFilipa Lacerda2017-12-192-38/+29
| |\ \ \ \ \ \
| * | | | | | | Update axios.mdfl-update-axios-docsFilipa Lacerda2017-12-191-1/+1
* | | | | | | | Merge branch 'preserve-gem-path' into 'master'Rémy Coutable2017-12-191-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Preserve gem path so that we use the same gemspreserve-gem-pathLin Jen-Shin2017-12-191-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'docs/omnibus-2452-tidy-gitlab-application' into 'master'Marin Jankovski2017-12-191-12/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Tidy up the documentation of Gitlab HA/Gitlab ApplicationRichard Clamp2017-12-191-12/+11
|/ / / / / /
* | | | | | Merge branch 'except-qa-and-docs' into 'master'Grzegorz Bizon2017-12-191-26/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make sure two except won't overwrite each otherLin Jen-Shin2017-12-191-26/+18
|/ / / / /
* | | | | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-198-0/+24
|\ \ \ \ \
| * | | | | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missingMatija Čupić2017-12-184-4/+4
View Lorry Controller Status