summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove transitions on nav link hover35210-disable-nav-animationsAnnabel Dunstone Gray2017-07-181-3/+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
| * | | | | | | avoid #respond_to? in Cache.id_forhttp://jneen.net/2017-07-171-5/+8
| * | | | | | | cache DeclarativePolicy.class_for at the class levelhttp://jneen.net/2017-07-171-5/+35
* | | | | | | | Merge branch '35225-transient-poll' into 'master'Phil Hughes2017-07-184-23/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | fix transient rspec failure due to Poll.js race condition35225-transient-pollSimon Knox2017-07-184-23/+37
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'an-rename-gitaly-services' into 'master'Sean McGivern2017-07-1814-61/+61
|\ \ \ \ \ \ \
| * | | | | | | Renamed Gitaly servicesAndrew Newdigate2017-07-1814-61/+61
|/ / / / / / /
* | | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-07-181-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Update 9.3-to-9.4.mdAndrew Newdigate2017-07-171-2/+1
* | | | | | | | Merge branch '29901-refactor-initialization-dropzone_input.js' into 'master'Clement Ho2017-07-182-47/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Refactor variables initialization in dropzone_input.jsBrandon Everett2017-07-182-47/+58
|/ / / / / / /
* | | | | | | Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-175-11/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove .coffee ext files for i18nTakuya Noguchi2017-07-082-2/+1
| * | | | | | | Remove coffee-rails gemTakuya Noguchi2017-07-083-9/+4
* | | | | | | | Merge branch '35177-dropdown-padding' into 'master'Annabel Dunstone Gray2017-07-173-21/+20
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix padding on filtered search dropdown. Styles should only apply to li in listSimon Knox2017-07-183-21/+20
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '34940-peek-performance-bar-doesn-t-count-cached-queries-but-sho...Sean McGivern2017-07-171-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-themRémy Coutable2017-07-171-1/+8
* | | | | | | | Merge branch '31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue' into '...Rémy Coutable2017-07-173-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Skip dead jobs queue for web hooks and project services31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queueSean McGivern2017-07-173-1/+8
| | |_|_|_|/ / / | |/| | | | | |