summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix has_one relationshiperror_tracking-feature_flagPeter Leitzen2018-12-131-1/+2
* Fake frequencyPeter Leitzen2018-12-131-2/+16
* Expose Sentry's frequencyPeter Leitzen2018-12-132-0/+3
* Expose Sentry external urlPeter Leitzen2018-12-132-9/+25
* Move error tracking settings update to own controllerLogan King2018-12-133-19/+29
* Add error tracking settings model and update endpointLogan King2018-12-134-0/+46
* Wire Sentry issues service with the controllerPeter Leitzen2018-12-131-46/+11
* Map json issues to ErrorTracking::Errors objectsrpereira22018-12-131-1/+44
* Improvements to the sentry issue servicerpereira22018-12-132-24/+24
* Rename the SentryService service filerpereira22018-12-131-0/+0
* Add an error_tracking_settings tablerpereira22018-12-132-1/+50
* Merge branch 'error_tracking-feature_flag'rpereira22018-12-129-0/+219
|\
| * Implement error modelPeter Leitzen2018-12-122-44/+59
| * Add mock data (to aid frontend dev) and json schemaLogan King2018-12-114-3/+72
| * Add and check feature flag `error_tracking`Peter Leitzen2018-12-112-0/+32
| * Render empty list of errorsPeter Leitzen2018-12-116-0/+103
* | Add a sentry servicerpereira22018-12-121-0/+24
|/
* Merge branch 'winh-princess-mononospace' into 'master'Fatih Acet2018-12-113-3/+54
|\
| * Make commit IDs in merge request discussion header monospaceWinnie Hellmann2018-12-113-3/+54
|/
* Merge branch 'fix-n-plus-1-queries-projects' into 'master'Douwe Maan2018-12-1110-6/+60
|\
| * Reduce N+1 from Activity Dashboard and BanzaiGabriel Mazetto2018-12-107-3/+57
| * Remove STI #becomes call from Dashboard indexGabriel Mazetto2018-12-101-1/+1
| * Eager-load relations for Explore::ProjectsControllerGabriel Mazetto2018-12-101-1/+1
| * Eager-load relations for Dashboard::ProjectsControllerGabriel Mazetto2018-12-101-1/+1
* | Merge branch 'sh-revert-mr-22911' into 'master'Grzegorz Bizon2018-12-113-6/+2
|\ \
| * | Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'm...Stan Hu2018-12-103-6/+2
* | | Merge branch '55138-fix-mr-discussions-count' into 'master'Phil Hughes2018-12-113-28/+50
|\ \ \ | |/ / |/| |
| * | Fix MR discussion counts being offPaul Slaughter2018-12-103-28/+50
* | | Merge branch '11-6-update-gitignore' into 'master'Robert Speicher2018-12-1012-101/+102
|\ \ \
| * | | Update the .gitignoreAlex Hanselka2018-12-1012-101/+102
| |/ /
* | | Merge branch '11-6-update-license' into 'master'Robert Speicher2018-12-101-56/+98
|\ \ \
| * | | Update License info for 11.6 feature freezeAlex Hanselka2018-12-101-56/+98
| |/ /
* | | Merge branch 'ichernikov/add-asignee-to-mr' into 'master'Mark Lapierre2018-12-106-2/+22
|\ \ \
| * | | Extended MR spec to set assigneeichernikov-add-assignee-to-mrievgenChernikov2018-12-106-2/+22
* | | | Merge branch 'upgrade-to-workhorse-7.6.0' into 'master'Robert Speicher2018-12-102-1/+6
|\ \ \ \
| * | | | Upgrade to workhorse 7.6.0:Andrew Newdigate2018-12-102-1/+6
|/ / / /
* | | | Merge branch 'sh-json-serialize-broadcast-messages' into 'master'Robert Speicher2018-12-103-4/+80
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid caching BroadcastMessage as an ActiveRecord objectStan Hu2018-12-083-4/+80
* | | | Merge branch 'sh-bump-sentry-raven-gem' into 'master'Robert Speicher2018-12-101-1/+1
|\ \ \ \
| * | | | Bump sentry-raven gem to 2.7.4Stan Hu2018-12-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'profile-fixing' into 'master'Annabel Dunstone Gray2018-12-103-8/+16
|\ \ \ \
| * | | | Add bottom margin depends on profile tabs visibility.Harry Kiselev2018-12-102-2/+6
| * | | | Remove unnecessary paddings at profile user bio block.Harry Kiselev2018-12-102-1/+5
| * | | | Fix profile_header bottom margin, #51807.Harry Kiselev2018-12-102-6/+6
* | | | | Merge branch '49713-main-navbar-is-broken-in-certain-viewport-widths' into 'm...Annabel Dunstone Gray2018-12-107-23/+34
|\ \ \ \ \
| * | | | | Resolve main nav clipping in certain breakpointsDennis Tang2018-12-107-23/+34
* | | | | | Merge branch 'fail-danger-in-ci' into 'master'Rémy Coutable2018-12-101-1/+0
|\ \ \ \ \ \
| * | | | | | Don't allow Danger to fail in CI any moreYorick Peterse2018-12-101-1/+0
* | | | | | | Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'Douwe Maan2018-12-103-1/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix a frozen string error in lib/gitlab/utils.rbRémy Coutable2018-12-103-1/+12