summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* TEMP: Add FIXMEs for remaining violationsrs-gitlab-security-json-serializationRobert Speicher2017-08-173-0/+5
* Remove the `pretty` parameter for `usage_data`Robert Speicher2017-08-172-3/+2
* fixup! Add RuboCop configuration for GitlabSecurity/JsonSerializationRobert Speicher2017-08-171-2/+2
* TEMP: Reformat a complex `to_json` call so its violations are clearerRobert Speicher2017-08-161-1/+8
* Use LabelSerializer instead of calling `@labels.to_json`Robert Speicher2017-08-162-2/+2
* Whitelist GitlabSecurity/JsonSerialization violations for safe usesRobert Speicher2017-08-1614-13/+15
* Add RuboCop configuration for GitlabSecurity/JsonSerializationRobert Speicher2017-08-161-0/+11
* Merge branch 'charlock-holmes-0.7.5' into 'master'Douwe Maan2017-08-162-3/+3
|\
| * Use charlock_holmes 0.7.5Jacob Vosmaer2017-08-162-3/+3
* | Merge branch 'docs/database-development' into 'master'Rémy Coutable2017-08-167-1/+220
|\ \
| * | Document not using database hash indexesYorick Peterse2017-08-162-0/+21
| * | Document how to handle different DB (versions)Yorick Peterse2017-08-162-0/+27
| * | State that comma separated data is serialised dataYorick Peterse2017-08-161-1/+2
| * | Add more database development related docsYorick Peterse2017-08-164-0/+170
* | | Merge branch 'icon-sidebar-expanded-margin' into 'master'Clement Ho2017-08-161-2/+4
|\ \ \ | |_|/ |/| |
| * | Fixes icon sidebar expanding causing a jump in paddingicon-sidebar-expanded-marginPhil Hughes2017-08-151-2/+4
* | | Merge branch '36442-images-in-issue-descriptions-no-longer-scale-to-the-width...Phil Hughes2017-08-161-0/+1
|\ \ \
| * | | Set Description Image to max-width 100%36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-containerTim Zallmann2017-08-161-0/+1
* | | | Merge branch 'winh-navcontrols-dropdown-style' into 'master'Clement Ho2017-08-162-1/+3
|\ \ \ \
| * | | | Make sort by dropdown style consistentWinnie Hellmann2017-08-162-1/+3
|/ / / /
* | | | Merge branch 'jej/document-pick-into-backports' into 'master'Sean McGivern2017-08-161-6/+10
|\ \ \ \
| * | | | Document "Pick into Backports" label processjej/document-pick-into-backportsJames Edwards-Jones2017-08-101-6/+10
* | | | | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-164-13/+58
|\ \ \ \ \
| * | | | | Use better higher threshold settings for storage access in testsBob Van Landuyt2017-08-161-0/+3
| * | | | | Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt2017-08-163-13/+55
* | | | | | Merge branch '36430-edit-milestone-link' into 'master'Grzegorz Bizon2017-08-163-4/+29
|\ \ \ \ \ \
| * | | | | | Fix edit milestone path from group milestones listJarka Kadlecova2017-08-163-4/+29
* | | | | | | Merge branch 'dispatcher-race-condition-fix' into 'master'Tim Zallmann2017-08-168-14/+20
|\ \ \ \ \ \ \
| * | | | | | | Fix race condition with dispatcher.jsdispatcher-race-condition-fixPhil Hughes2017-08-158-14/+20
* | | | | | | | Merge branch 'safari-overscroll-sticky-fix' into 'master'Tim Zallmann2017-08-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes sticky class being removed when over-scrolling in Safarisafari-overscroll-sticky-fixPhil Hughes2017-08-151-1/+1
* | | | | | | | | Merge branch 'search-spec' into 'master'Rémy Coutable2017-08-1611-147/+209
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change find to within for detecting bad search specsClement Ho2017-08-1611-147/+209
|/ / / / / / / / /
* | | | | | | | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-1661-88/+128
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-1461-88/+128
* | | | | | | | | Merge branch '34049-public-commits-should-not-require-authentication' into 'm...Rémy Coutable2017-08-162-100/+117
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added tests for commits API with an unauthenticated user and a public/private...Jacopo2017-08-102-100/+117
* | | | | | | | | | Merge branch 'update-git-to-2.13.0' into 'master'Rémy Coutable2017-08-162-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Git version for source installs to match OmnibusAndrew Newdigate2017-08-162-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-1652-99/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix two additional violations caused by previous changesrs-trailingwhitespace-copRobert Speicher2017-08-152-2/+0
| * | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-1553-100/+99
* | | | | | | | | | | Merge branch '34643-fix-project-path-slugify' into 'master'Rémy Coutable2017-08-166-7/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix CI_PROJECT_PATH_SLUG slugifyvanadium232017-08-156-7/+39
* | | | | | | | | | | | Merge branch 'rs-redis-config-paths' into 'master'Douwe Maan2017-08-165-16/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't depend on `Rails` for Redis configuration file pathsrs-redis-config-pathsRobert Speicher2017-08-155-16/+19
* | | | | | | | | | | | | Merge branch '34533-speed-up-project-creation' into 'master'Douwe Maan2017-08-164-15/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Speed up project creation by inlining repository creationNick Thomas2017-08-154-15/+55
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '36465-duplicate-events' into 'master'Douwe Maan2017-08-165-2/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't create event in Merge Request Create ServiceJarka Kadlecova2017-08-165-2/+63
|/ / / / / / / / / / / / /
View Lorry Controller Status