summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* resolve remaining eslint violations35224-transform-user-profile-javascript-into-async-bundleMike Greiling2017-07-282-63/+58
* resolve eqeqeq, newline-per-chained-call, no-unused-vars, and no-else-return ...Mike Greiling2017-07-281-10/+11
* resolve consistent-return eslint violationMike Greiling2017-07-281-5/+3
* resolve prefer-template and quotes eslint violationsMike Greiling2017-07-281-7/+14
* resolve no-mixed-operators and no-return-assign eslint violationsMike Greiling2017-07-281-6/+6
* resolve comma-dangle and object-shorthand eslint violationsMike Greiling2017-07-281-23/+12
* resolve camelcase violationsMike Greiling2017-07-281-9/+6
* remove janky function binding in activity calendar classMike Greiling2017-07-281-45/+55
* fix all eslint violations in user_tabs.jsMike Greiling2017-07-281-80/+73
* remove implied "GET" http method optionMike Greiling2017-07-271-1/+0
* remove needless brackets object accessor syntaxMike Greiling2017-07-271-2/+2
* fix broken testsMike Greiling2017-07-191-2/+2
* refactor users bundle, remove inline javascript, and transform into an async ...Mike Greiling2017-07-185-50/+25
* refactor async calendar dataMike Greiling2017-07-185-18/+27
* Merge branch '35087-mr-status-misaligned' into 'master'Annabel Dunstone Gray2017-07-182-0/+12
|\
| * 35087 Fix alignment of controls in mr issuable list35087-mr-status-misalignedtauriedavis2017-07-172-0/+12
* | Merge branch 'rs-disable-test-log-in-ci' into 'master'Rémy Coutable2017-07-182-0/+10
|\ \
| * | Disable Rails logging in CI test environmentsrs-disable-test-log-in-ciRobert Speicher2017-07-182-0/+10
* | | Merge branch '35252-fix-performance-bar-queries-duration-sorting' into 'master'Robert Speicher2017-07-181-1/+1
|\ \ \
| * | | Fix queries duration sorting in Performance Bar35252-fix-performance-bar-queries-duration-sortingRémy Coutable2017-07-181-1/+1
* | | | Merge branch '35129-update-prometheus-docs' into 'master'Marcia Ramos2017-07-189-48/+182
|\ \ \ \
| * \ \ \ Fix merge conflictsJoshua Lambert2017-07-18130-814/+1509
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch '35175-update-prometheus-admin-documentation-for-9-4-docs' into ...Marcia Ramos2017-07-182-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed typos35175-update-prometheus-admin-documentation-for-9-4-docsJoshua Lambert2017-07-181-2/+2
| * | | | Update admin docsJoshua Lambert2017-07-172-2/+3
* | | | | Merge branch 'update-gitaly-to-0.21.2' into 'master'fix-ci-table-timingRobert Speicher2017-07-181-1/+1
|\ \ \ \ \
| * | | | | Update Gitaly Server Version to 0.21.2update-gitaly-to-0.21.2Andrew Newdigate2017-07-181-1/+1
* | | | | | Merge branch 'master' into 'master'Clement Ho2017-07-182-0/+8
|\ \ \ \ \ \
| * | | | | | reset text-align to initial to let elements with dir="auto" align texts to ri...goshkob2017-07-182-0/+8
|/ / / / / /
* | | | | | Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into ...Kamil Trzciński2017-07-185-3/+100
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use batching to clear orphans in head_pipeline migrationbackstage/gb/add-index-and-foreign-key-to-merge-requestsGrzegorz Bizon2017-07-182-3/+51
| * | | | | Nullify orphaned head_pipeline_ids in merge_requestsGrzegorz Bizon2017-07-181-0/+8
| * | | | | Add a foreign key to `merge_requests.head_pipeline_id`Grzegorz Bizon2017-07-184-3/+44
* | | | | | Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'Robert Speicher2017-07-182-1/+2
|\ \ \ \ \ \
| * | | | | | Don't install fog-aws and mime-types gems in scripts/prepare_build.sh34915-do-not-install-fog-aws-in-prepare_buildRémy Coutable2017-07-132-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'request-store-wrap' into 'master'Rémy Coutable2017-07-1810-30/+258
|\ \ \ \ \ \
| * | | | | | Remove unneeded asserts and add tests for inactive RequestStoreLin Jen-Shin2017-07-181-28/+20
| * | | | | | Rename the methods to make it fit with current nameLin Jen-Shin2017-07-184-20/+20
| * | | | | | Follow feedback on the merge requestLin Jen-Shin2017-07-185-19/+15
| * | | | | | Cache Note#notable for commits and fix testsrequest-store-wrapLin Jen-Shin2017-07-184-5/+11
| * | | | | | Add changelog entryLin Jen-Shin2017-07-181-0/+4
| * | | | | | Update the comments for the new functionalityLin Jen-Shin2017-07-181-3/+19
| * | | | | | Use RequestStoreWrap for Commit#authorLin Jen-Shin2017-07-184-58/+93
| * | | | | | Add RequestStoreWrap to cache via RequestStoreLin Jen-Shin2017-07-173-4/+183
* | | | | | | Merge branch '34927-protect-manual-actions-on-tags' into 'master'Grzegorz Bizon2017-07-183-9/+49
|\ \ \ \ \ \ \
| * | | | | | | Make sure it checks against the tag only when it's a tag34927-protect-manual-actions-on-tagsLin Jen-Shin2017-07-182-1/+23
| * | | | | | | Add changelog entryLin Jen-Shin2017-07-171-0/+4
| * | | | | | | Protect manual actions against protected tag tooLin Jen-Shin2017-07-172-9/+23
* | | | | | | | Merge branch 'perf/policy-class-cache' into 'master'Sean McGivern2017-07-183-17/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | cache the cache key...perf/policy-class-cachehttp://jneen.net/2017-07-171-7/+8